various bugs introduced by --path

6 files changed, 19 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fddd4050bc6c..c7c50858dbb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Aug  5 15:12:33 UTC 2016
+# Fri Aug  5 16:44:56 UTC 2016
 pkgbase = asf
 	pkgdesc = Steam cards farmer.
 	pkgver = 2.1.3.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/JustArchi/ArchiSteamFarm
 	install = asf.install
 	changelog = changelog
@@ -11,7 +11,7 @@ pkgbase = asf
 	license = Apache
 	depends = mono
 	backup = opt/asf/config/ASF.json
-	backup = var/lib/asf/ASF.json
+	backup = var/lib/asf/config/ASF.json
 	source = https://github.com/JustArchi/ArchiSteamFarm/releases/download/2.1.3.1/ASF.zip
 	source = asf.sh
 	source = asf-config.sh
@@ -20,8 +20,8 @@ pkgbase = asf
 	sha256sums = 43db7c2729551fcb7f546a473f6fd90ab7ca296f641f55334b240f3c39109f16
 	sha256sums = a5d0324c029efb1f99264e787fea26ad53953b4df59bf642bca1ffabad4027f5
 	sha256sums = 63b8d4718e8cc61016ef415ff418e6180102b077315f5ce77bfcab9c03433565
-	sha256sums = 580845c04b2add412f9bc642c429a5dad274d5f637da42dc95ba10993cab7825
-	sha256sums = c50da9f236788ebce411ff2db524279b22a9077b5d69f4262a2cfe307152c2a1
+	sha256sums = 39166dc6947b81ba9a3f60cc1f117198050fb5e4a7fb16a199adb2a77af2b205
+	sha256sums = 1948780515929c7fc8ffa6033bc79a55cbae375a1397326ef9dba0dfbe91cc56
 
 pkgname = asf
 
diff --git a/PKGBUILD b/PKGBUILD
index 60c29454b0a6..77284128a4c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname="asf"
 pkgver="2.1.3.1"
-pkgrel=2
+pkgrel=3
 pkgdesc="Steam cards farmer."
 arch=('any')
 url="https://github.com/JustArchi/ArchiSteamFarm"
 license=('Apache')
 depends=('mono')
 changelog=changelog
-backup=('opt/asf/config/ASF.json' 'var/lib/asf/ASF.json')
+backup=('opt/asf/config/ASF.json' 'var/lib/asf/config/ASF.json')
 install=${pkgname}.install
 source=("https://github.com/JustArchi/ArchiSteamFarm/releases/download/${pkgver}/ASF.zip"
         "${pkgname}.sh"
@@ -19,14 +19,14 @@ source=("https://github.com/JustArchi/ArchiSteamFarm/releases/download/${pkgver}
 sha256sums=('43db7c2729551fcb7f546a473f6fd90ab7ca296f641f55334b240f3c39109f16'
             'a5d0324c029efb1f99264e787fea26ad53953b4df59bf642bca1ffabad4027f5'
             '63b8d4718e8cc61016ef415ff418e6180102b077315f5ce77bfcab9c03433565'
-            '580845c04b2add412f9bc642c429a5dad274d5f637da42dc95ba10993cab7825'
-            'c50da9f236788ebce411ff2db524279b22a9077b5d69f4262a2cfe307152c2a1')
+            '39166dc6947b81ba9a3f60cc1f117198050fb5e4a7fb16a199adb2a77af2b205'
+            '1948780515929c7fc8ffa6033bc79a55cbae375a1397326ef9dba0dfbe91cc56')
 
 package() {
     install -d -m 755 "${pkgdir}/opt/${pkgname}"
-    install -d -m 755 "${pkgdir}/var/lib/${pkgname}"
+    install -d -m 755 "${pkgdir}/var/lib/${pkgname}/config"
     cp -dp --no-preserve=ownership *.exe "${pkgdir}/opt/${pkgname}"
-    cp -dp --no-preserve=ownership config/* "${pkgdir}/var/lib/${pkgname}"
+    cp -dp --no-preserve=ownership config/* "${pkgdir}/var/lib/${pkgname}/config"
 
     install -D -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
     install -D -m755 "${srcdir}/${pkgname}-config.sh" "${pkgdir}/usr/bin/${pkgname}-config"
@@ -34,6 +34,6 @@ package() {
     install -D -m644 "${srcdir}/${pkgname}-user.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
 
     # disable auto-updates and version checks
-    sed -i 's/"AutoUpdates": true,/"AutoUpdates": false,/g' ${pkgdir}/var/lib/asf/ASF.json
-    sed -i 's/"UpdateChannel": 1,/"UpdateChannel": 0,/g' ${pkgdir}/var/lib/asf/ASF.json
+    sed -i 's/"AutoUpdates": true,/"AutoUpdates": false,/g' ${pkgdir}/var/lib/${pkgname}/config/ASF.json
+    sed -i 's/"UpdateChannel": 1,/"UpdateChannel": 0,/g' ${pkgdir}/var/lib/${pkgname}/config/ASF.json
 }
diff --git a/asf-user.service b/asf-user.service
index bae04ea0c43d..f58efcefd117 100644
--- a/asf-user.service
+++ b/asf-user.service
@@ -4,7 +4,7 @@ Documentation=https://github.com/JustArchi/ArchiSteamFarm/wiki
 Wants=network.target
 
 [Service]
-ExecStart=/usr/bin/asf --server --path %h/.config/asf
+ExecStart=/usr/bin/asf --server --path=%h/.config/asf
 
 [Install]
 WantedBy=default.target
diff --git a/asf.install b/asf.install
index 9e587e23cd9e..fe50d9acc5b7 100644
--- a/asf.install
+++ b/asf.install
@@ -18,16 +18,13 @@ post_upgrade() {
       usermod -s /bin/false -c "ArchiSteamFarm daemon" -d /var/lib/asf -g asf asf &> /dev/null
     fi
     if [ "$(vercmp $2 2.1.3.1-2)" -lt 0 ] && [ -d /opt/asf/config ]; then
-      mv /opt/asf/config/* /var/lib/asf/
-      rm -rf /opt/asf/config/
+      mv /opt/asf/config/ /var/lib/asf/
       mv /opt/asf/log.txt /var/lib/asf/
 
-      mv /var/lib/asf/ASF.json.pacsave /var/lib/asf/ASF.json
-
       chown -R asf: /var/lib/asf
 
       echo "# ASF config folder has been moved to /var/lib/asf"
-      echo "# Consider this change when using /usr/bin/asf (e.g. 'asf --path /var/lib/asf')"
+      echo "# Consider this change when using /usr/bin/asf (e.g. 'asf --path=/var/lib/asf')"
     fi
 }
 
diff --git a/asf.service b/asf.service
index 987ea1a97a52..e831f1d8556d 100644
--- a/asf.service
+++ b/asf.service
@@ -7,7 +7,7 @@ After=network.target
 [Service]
 User=asf
 Group=asf
-ExecStart=/usr/bin/asf --server --path /var/lib/asf
+ExecStart=/usr/bin/asf --server --path=/var/lib/asf
 ProtectSystem=true
 ReadWritePaths=/var/lib/asf
 
diff --git a/changelog b/changelog
index 1c793ea37fb0..04b7dfa23a6c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
 2016-08-05 Gilrain <gilrain+libre.arch A_T castelmo DOT_ re>
+  * 2.1.3.1-3:
+    package & services : fix various bugs pertaining to --path
   * 2.1.3.1-2:
     package: config folder moved to /var/lib/asf
     service: rename ReadWriteDirectories to ReadWritePaths