Change to /run and rename tmpfile.

4 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29b600780b69..a59a8572bb03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rslsync
 	pkgdesc = Resilio Sync (ex:BitTorrent Sync) - automatically sync files via secure, distributed technology
 	pkgver = 2.6.0.1317
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.getsync.com
 	install = rslsync.install
 	arch = i686
@@ -14,10 +14,10 @@ pkgbase = rslsync
 	backup = etc/rslsync.conf
 	source = rslsync.service
 	source = rslsync_user.service
-	source = rslsync.conf
+	source = rslsync.tmpfiles
 	sha256sums = 4483cbe3fff81281666d8fbe8c9b8d7d27c38ba7a3d3752a865f1ab8c1f212db
 	sha256sums = ba4b0ee3303027122e67345d4bf852f911a56f213f98c9eaa198c69d903fd8a1
-	sha256sums = 56a0523cdde9b6c1c469bbb29805d260972e8e1fc831e82863fd35d9e2f6c734
+	sha256sums = 150408a99eea8082b1df115c2c836f4e8e68a85eba7cd56b5885ebd4e07dceda
 	source_i686 = rslsync_i386-2.6.0.1317.tar.gz::https://download-cdn.resilio.com/stable/linux-i386/resilio-sync_i386.tar.gz
 	sha256sums_i686 = 1ab6eb8bc0dfed1b702aad75ac5c02de124ca6ba6f3c8162fa4119472e3523ab
 	source_x86_64 = rslsync_x64-2.6.0.1317.tar.gz::https://download-cdn.resilio.com/stable/linux-x64/resilio-sync_x64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 9eab8af6b282..43396f46feb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=rslsync
 pkgver=2.6.0.1317
-pkgrel=1
+pkgrel=2
 pkgdesc="Resilio Sync (ex:BitTorrent Sync) - automatically sync files via secure, distributed technology"
 license=("custom:resilio")
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -14,7 +14,7 @@ url="https://www.getsync.com"
 install=rslsync.install
 backup=('etc/rslsync.conf')
 conflicts=()
-source=(rslsync.service rslsync_user.service rslsync.conf)
+source=(rslsync.service rslsync_user.service rslsync.tmpfiles)
 source_arm=("rslsync_arm-${pkgver}.tar.gz::https://download-cdn.resilio.com/stable/linux-arm/resilio-sync_arm.tar.gz")
 source_armv6h=("rslsync_arm-${pkgver}.tar.gz::https://download-cdn.resilio.com/stable/linux-arm/resilio-sync_arm.tar.gz")
 source_armv7h=("rslsync_armhf-${pkgver}.tar.gz::https://download-cdn.resilio.com/stable/linux-armhf/resilio-sync_armhf.tar.gz")
@@ -23,7 +23,7 @@ source_i686=("rslsync_i386-${pkgver}.tar.gz::https://download-cdn.resilio.com/st
 source_x86_64=("rslsync_x64-${pkgver}.tar.gz::https://download-cdn.resilio.com/stable/linux-x64/resilio-sync_x64.tar.gz")
 sha256sums=('4483cbe3fff81281666d8fbe8c9b8d7d27c38ba7a3d3752a865f1ab8c1f212db'
             'ba4b0ee3303027122e67345d4bf852f911a56f213f98c9eaa198c69d903fd8a1'
-            '56a0523cdde9b6c1c469bbb29805d260972e8e1fc831e82863fd35d9e2f6c734')
+            '150408a99eea8082b1df115c2c836f4e8e68a85eba7cd56b5885ebd4e07dceda')
 sha256sums_i686=('1ab6eb8bc0dfed1b702aad75ac5c02de124ca6ba6f3c8162fa4119472e3523ab')
 sha256sums_x86_64=('5f73bfefeedf8e042d483d00aa4af93f09a5b7cbd1efaedcbc3a2b9662578100')
 sha256sums_arm=('e66a6f4380db09b2ea08d7e0f3722c0587317fac9c13558817af837a4c5bba7f')
@@ -42,13 +42,13 @@ package() {
   | sed 's:/home/user/\.sync:/var/lib/rslsync:' \
   | sed 's:\/\/ "pid_file":  "pid_file":' \
   | sed 's:\/\/ "storage_path":  "storage_path":' \
-  | sed 's/\/var\/run\/resilio\/resilio.pid/\/var\/run\/resilio\/resilio.pid/g' \
+  | sed 's/\/var\/run\/resilio/\/run\/resilio/g' \
   > "${pkgdir}"/etc/rslsync.conf
   chmod 644 "${pkgdir}"/etc/rslsync.conf
 
   # install systemd config files
   install -Dm644 "${srcdir}"/rslsync.service "${pkgdir}"/usr/lib/systemd/system/rslsync.service
-  install -Dm644 "${srcdir}"/rslsync.conf "${pkgdir}"/usr/lib/tmpfiles.d/rslsync.conf
+  install -Dm644 "${srcdir}"/rslsync.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/rslsync.conf
   install -Dm644 "${srcdir}"/rslsync_user.service "${pkgdir}"/usr/lib/systemd/user/rslsync.service
 
   # install license
diff --git a/rslsync.conf b/rslsync.conf
deleted file mode 100644
index 00711e19cba9..000000000000
--- a/rslsync.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/resilio 0755 rslsync rslsync -
diff --git a/rslsync.tmpfiles b/rslsync.tmpfiles
new file mode 100644
index 000000000000..9d671a3e13b3
--- /dev/null
+++ b/rslsync.tmpfiles
@@ -0,0 +1 @@
+D /run/resilio 0755 rslsync rslsync -