From e21dc2291edeb7ad07e22a53943f33ab14f06f3b Mon Sep 17 00:00:00 2001 From: Gilrain Date: Thu, 25 Jun 2020 11:02:26 +0200 Subject: [PATCH] replace custom launch script with upstream --- .SRCINFO | 6 ++---- PKGBUILD | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d90250dd71c0..b24408be2340 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = asf pkgdesc = Steam cards farmer. - pkgver = 4.2.3.3 + pkgver = 4.2.2.1 pkgrel = 1 url = https://github.com/JustArchiNET/ArchiSteamFarm install = install @@ -15,14 +15,12 @@ pkgbase = asf optdepends = asf-ui: standalone web interface for ASF backup = var/lib/asf/config/ASF.json backup = usr/lib/asf/NLog.config - source = asf::git+https://github.com/JustArchiNET/ArchiSteamFarm.git#tag=4.2.3.3 - source = asf.sh + source = asf::git+https://github.com/JustArchiNET/ArchiSteamFarm.git#tag=4.2.2.1 source = service source = service.user source = ASF.json source = NLog.config sha256sums = SKIP - sha256sums = 8d76996c1024b80704b25af8a8800ef3f8a8a518d19c2a1e85ba62b58b22cdfd sha256sums = ba1ff85e55e56d71dbdd0d898244ff7725bced8625f29c5389e28525e6cdb987 sha256sums = b627c8d4b3ba7f194a44749bd401b33bae601b9570da98e457737a6f9cfa408f sha256sums = e63a92fd8008c40dab963161bdac967b57146553c00f114469c204ac6e1795b2 diff --git a/PKGBUILD b/PKGBUILD index 89102cc8480f..517fb6c0de5a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,13 +15,11 @@ changelog=changelog backup=('var/lib/asf/config/ASF.json' 'usr/lib/asf/NLog.config') install=install source=("asf::git+https://github.com/JustArchiNET/ArchiSteamFarm.git#tag=${pkgver}" - "${pkgname}.sh" "service" "service.user" "ASF.json" "NLog.config") sha256sums=('SKIP' - '8d76996c1024b80704b25af8a8800ef3f8a8a518d19c2a1e85ba62b58b22cdfd' 'ba1ff85e55e56d71dbdd0d898244ff7725bced8625f29c5389e28525e6cdb987' 'b627c8d4b3ba7f194a44749bd401b33bae601b9570da98e457737a6f9cfa408f' 'e63a92fd8008c40dab963161bdac967b57146553c00f114469c204ac6e1795b2' @@ -37,6 +35,8 @@ package() { cd asf/out install -d -m 755 "${pkgdir}/usr/lib/${pkgname}" cp -rdp --no-preserve=ownership . "${pkgdir}/usr/lib/asf" + install -D -m755 ../run.sh "${pkgdir}/usr/bin/${pkgname}" + sed -i 's,^\(BINARY_PATH[ ]*=\).*,\1'/usr/lib/asf',g' "${pkgdir}/usr/bin/${pkgname}" find "${pkgdir}/usr/lib/${pkgname}" -type f -exec chmod 644 {} \; find "${pkgdir}/usr/lib/${pkgname}" -type d -exec chmod 755 {} \; @@ -44,8 +44,6 @@ package() { install -D -m644 "${srcdir}/ASF.json" "${pkgdir}/var/lib/${pkgname}/config/ASF.json" install -D -m644 "${srcdir}/NLog.config" "${pkgdir}/usr/lib/${pkgname}/NLog.config" - install -D -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -D -m644 "${srcdir}/service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" install -D -m644 "${srcdir}/service.user" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"