use git tags as source

2 files changed, 10 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd9113356bbd..f5f0cc4ccb5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,20 +9,19 @@ pkgbase = asf
 	arch = armv7h
 	arch = aarch64
 	license = Apache
+	makedepends = git
 	makedepends = dotnet-sdk>=3.1
-	makedepends = npm
 	depends = aspnet-runtime>=3.1
+	optdepends = asf-ui
 	backup = var/lib/asf/config/ASF.json
 	backup = usr/lib/asf/NLog.config
-	source = https://github.com/JustArchi/ArchiSteamFarm/archive/4.1.1.4.tar.gz
-	source = asf-ASF-ui-575e11498d432ec37a08236b8801110addac676d.tar.gz::https://github.com/JustArchiNET/ASF-ui/archive/575e11498d432ec37a08236b8801110addac676d.tar.gz
+	source = asf::git+https://github.com/JustArchiNET/ArchiSteamFarm.git#tag=4.1.1.4
 	source = asf.sh
 	source = service
 	source = service.user
 	source = ASF.json
 	source = NLog.config
-	sha256sums = 7da3b7954300ef6a69e1ab97f96ccc66c03ccd36165c90a54cb3e539c5741d1b
-	sha256sums = 16283371243377d768bc3ee8d175e7bc0f291178d419cf245478516cc72e2b78
+	sha256sums = SKIP
 	sha256sums = 8d76996c1024b80704b25af8a8800ef3f8a8a518d19c2a1e85ba62b58b22cdfd
 	sha256sums = ba1ff85e55e56d71dbdd0d898244ff7725bced8625f29c5389e28525e6cdb987
 	sha256sums = b627c8d4b3ba7f194a44749bd401b33bae601b9570da98e457737a6f9cfa408f
diff --git a/PKGBUILD b/PKGBUILD
index 49ac5160a088..ffe01c76c566 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,43 +4,37 @@
 pkgname="asf"
 pkgver="4.1.1.4"
 pkgrel=2
-_asfuicommit="575e11498d432ec37a08236b8801110addac676d"
 pkgdesc="Steam cards farmer."
 arch=('x86_64' 'armv7h' 'aarch64')
 url="https://github.com/JustArchiNET/ArchiSteamFarm"
 license=('Apache')
 depends=('aspnet-runtime>=3.1')
-makedepends=('dotnet-sdk>=3.1' 'npm')
+optdepends=('asf-ui')
+makedepends=('git' 'dotnet-sdk>=3.1')
 changelog=changelog
 backup=('var/lib/asf/config/ASF.json' 'usr/lib/asf/NLog.config')
 install=install
-source=("https://github.com/JustArchi/ArchiSteamFarm/archive/${pkgver}.tar.gz"
-        "${pkgname}-ASF-ui-${_asfuicommit}.tar.gz::https://github.com/JustArchiNET/ASF-ui/archive/${_asfuicommit}.tar.gz"
+source=("asf::git+https://github.com/JustArchiNET/ArchiSteamFarm.git#tag=${pkgver}"
         "${pkgname}.sh"
         "service"
         "service.user"
         "ASF.json"
         "NLog.config")
-sha256sums=('7da3b7954300ef6a69e1ab97f96ccc66c03ccd36165c90a54cb3e539c5741d1b'
-            '16283371243377d768bc3ee8d175e7bc0f291178d419cf245478516cc72e2b78'
+sha256sums=('SKIP'
             '8d76996c1024b80704b25af8a8800ef3f8a8a518d19c2a1e85ba62b58b22cdfd'
             'ba1ff85e55e56d71dbdd0d898244ff7725bced8625f29c5389e28525e6cdb987'
             'b627c8d4b3ba7f194a44749bd401b33bae601b9570da98e457737a6f9cfa408f'
             'e63a92fd8008c40dab963161bdac967b57146553c00f114469c204ac6e1795b2'
             '1353977a61a2e8700df80729cabc88f453b704a0c6ccf45d80a91691fcf6338f')
 
-prepare() {
-    cp -rdp --no-preserve=ownership "ASF-ui-${_asfuicommit}/." "ArchiSteamFarm-${pkgver}/ASF-ui"
-}
-
 build() {
-    cd ArchiSteamFarm-${pkgver}
+    cd asf
     export DOTNET_CLI_TELEMETRY_OPTOUT=1
     ./cc.sh
 }
 
 package() {
-    cd ArchiSteamFarm-${pkgver}/out
+    cd asf/out
     install -d -m 755 "${pkgdir}/usr/lib/${pkgname}"
     cp -rdp --no-preserve=ownership . "${pkgdir}/usr/lib/asf"
     find "${pkgdir}/usr/lib/${pkgname}" -type f -exec chmod 644 {} \;