Implement kevincox's suggestions

PKGBUILD

@@ -23,12 +23,12 @@ source=("${pkgname}.install"
 	"terms-of-use.html::http://www.bittorrent.com/legal/terms-of-use"
 	"privacy-policy.html::http://www.bittorrent.com/legal/privacy"
 	)
-sha256sums=('7ffd62c83bd6cb6d083972b811e662323515153d6c543006ec7c18762566dd3d'
-	    '29db7228c3363bafddc797b97209b3fe3e07497521dac2de11811db7d80d6c09'
-	    '74e43597fb523206908ed4ed28811e6939185f6ae89d21e1b48058ab2f3fed47'
-	    '640ffaf885f00de78d97925201be8ccde753a43714064336a8355bc89d7332db'
-	    '6fe65cffe191db2090251ba2e0ed496b922847891645fc0248adebb7b64be803'
-	    '9df5e6b5db86b5d58b5e24038fc70f3789c0a44a31dd5ecb29fb59f7d018a485'
+sha256sums=('70189cc836ed0fd42496dad5ae586e31f65b87efb6f9182061049c1ff271133d'
+	    'f51c4e95b141a6ff6118fcbd26451d6887181bf27ee966f9beeda4bec9014261'
+	    '3d7d58815921c65e3d36beb739e5aaef513945ee713d3f4629e29d3af798efd5'
+	    '551f73b0400427679e3854fa0d043859e00ac38168d6658d27a1306443f2c5d9'
+	    'b45a32bcd0807d2df6e79593d20beb43febbfa6fd83373f9e1a5a7f8571e037e'
+	    'de4f2a124d56ddbaec23535a250dbe9001606f47b74f3c3c97056107b21c7f6e'
 	    'SKIP'
 	    'SKIP'
 	    )

bittorrent-sync.install

@@ -18,9 +18,7 @@ cat << EOF
   change the device_name, webui.login and webui.password settings. You can
   either edit the config file directly or use the
   /usr/share/bittorrent-sync/btsync-makeconfig.sh script, pass it the --help
-  flag to learn more about it. Please note that the PIDFile setting in
-  /usr/lib/systemd/system/btsync@.service assumes the default settings of
-  storage_path and pid_file.
+  flag to learn more about it.
 
   To start btsync, execute:
 

btsync-makeconfig.sh

@@ -74,10 +74,7 @@ OPTIONS
 
     --storage-path (~/.config/btsync)
         The directory to store config files and metadata, such as folder
-        keys and indices, in. If you change this, you will need to
-        modify the PIDFile entry in
-        /usr/lib/systemd/system/btsync@.service to point to the sync.pid
-        file in this directory.
+        keys and indices, in.
 
     --check-for-updates (true)
         Whether to check for updates from upstream If set to true, a

btsync-wrapper.sh

@@ -75,7 +75,7 @@ fi
 
 # Execute the btsync executable
 if [[ $configArgumentAppears == true ]]; then
-	/usr/bin/btsync $@
+	exec /usr/bin/btsync $@
 else
-	/usr/bin/btsync $@ --config $configPath
+	exec /usr/bin/btsync $@ --config $configPath
 fi

btsync.conf.doc

@@ -1,10 +1,3 @@
 /*
  * Configuration file for BitTorrent sync.
- *
- * The systemd daemon provided by the bittorrent-sync AUR package assumes that
- * the storage_path setting is set to "~/.config/btsync" and that the pid_file
- * setting is left at the default (commented out). If you change any of these
- * two settings, you will need to update the PIDFile setting in
- * /usr/lib/systemd/system/btsync@.service to point to the new pid file. By
- * default, it is located at storage_path/sync.pid.
  */

btsync.service

@@ -3,12 +3,10 @@ Description=BitTorrent Sync service
 After=network.target
 
 [Service]
-Type=forking
 User=btsync
 Group=btsync
-ExecStart=/usr/bin/btsync-wrapper --config /etc/btsync.conf
+ExecStart=/usr/bin/btsync-wrapper --config /etc/btsync.conf --nodaemon
 Restart=on-abort
-PIDFile=/var/lib/btsync/sync.pid
 
 [Install]
 WantedBy=multi-user.target

btsync@.service

@@ -3,11 +3,9 @@ Description=BitTorrent Sync service for %i
 After=network.target
 
 [Service]
-Type=forking
 User=%i
-ExecStart=/usr/bin/btsync-wrapper --config %h/.config/btsync/btsync.conf
+ExecStart=/usr/bin/btsync-wrapper --config %h/.config/btsync/btsync.conf --nodaemon
 Restart=on-abort
-PIDFile=%h/.config/btsync/sync.pid
 
 [Install]
 WantedBy=multi-user.target