fix system.d service

2 files changed, 19 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26a9f8058eb7..51d3aa02857c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.net
 	pkgver = autogenerated
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/skycoin/skywire
 	arch = any
 	makedepends = dep
diff --git a/PKGBUILD b/PKGBUILD
index a1d958e6cc1d..fea4bc6eee11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname1=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.net"
 pkgver='autogenerated'
 pkggopath="github.com/$projectname/$pkgname1"
-pkgrel=6
+pkgrel=7
 arch=('any')
 url="https://${pkggopath}"
 license=()
@@ -40,7 +40,7 @@ mips64el) export GOARCH="mips64le" ;;
 mipsel)   export GOARCH="mipsle" ;;
 *)        return 1 ;;
 	esac
-
+	
 pkgver() {
 	cd "$srcdir/$pkgname1"
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
@@ -86,11 +86,22 @@ go install \
   chmod +x $pkgname1-manager-nohup
   echo -e '#!/bin/bash \n #launch skywire node with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 127.0.0.1:5998 -manager-web 127.0.0.1:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-nohup
   chmod +x $pkgname1-node-nohup
+	#edit the following script for the IP of your manager; default is the official setup with manager at 192.168.0.2
   echo -e '#!/bin/bash \n #launch skywire official node with nohup \n GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 192.168.0.2:5998 -manager-web 192.168.0.2:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-miner
   chmod +x $pkgname1-node-miner
   echo -e '#!/bin/bash \n #launch skywire qubes node with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address discovery.skycoin.net:5999-034b1cd4ebad163e457fb805b3ba43779958bba49f2c5e1e8b062482904bacdb68 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 \n echo "skywire-node has started"' > $pkgname1-node-qubes
   chmod +x $pkgname1-node-qubes
+	echo -e '#!/bin/bash \n #halt skywire \n sudo killall skywire-node \n sudo killall skywire-manager \n \n echo "skywire halted"' > $pkgname1-halt
+	chmod +x $pkgname1-halt
+
+	msg 2 'creating system.d .service files'
+	#these service files point to skywire & skywire-node-miner scripts from above
+	#the systemd service files included with skywire are wrong for archlinux (debian formatted)
+  cd $srcdir/go
+	echo -e '[Unit] \n Description=Skywire Manager Node service \n	After=network.target \n After=network-online.target \n \n	[Service] \n Type=oneshot \n	ExecStart=/usr/bin/skywire \n	RemainAfterExit=yes \n ExecStop=/usr/bin/skywire-halt \n	TryExec=/usr/bin/skywire \n \n [Install] \n	WantedBy=multi-user.target ' > $pkgname1-manager.service
+	echo -e '[Unit] \n Description=Skywire Node service \n	After=network.target \n After=network-online.target \n \n	[Service] \n Type=oneshot \n	ExecStart=/usr/bin/skywire-node-miner \n	RemainAfterExit=yes \n ExecStop=/usr/bin/skywire-halt \n	TryExec=/usr/bin/skywire \n \n [Install] \n	WantedBy=multi-user.target ' > $pkgname1-node.service
 }
+
 package() {
   options=(!strip staticlibs)
   #create directory trees
@@ -103,11 +114,13 @@ package() {
   #install binaries & symlink to /usr/bin
 	msg2 'installing binaries'
 	skybins="$srcdir"/go/bin
+	#avoid generic names for binaries
 	potentialnameconflicts=$( ls --ignore=skywire* "$skybins")
 	cd $skybins
   for i in $potentialnameconflicts; do
     mv $skybins/$i $skybins/$pkgname1-$i
   done
+	#collect the binaries & install
 	skywirebins=$( ls "$skybins")
 	for i in $skywirebins; do
 	  install -Dm755 $srcdir/go/bin/$i $pkgdir/usr/lib/$projectname/go/bin/$i
@@ -124,4 +137,7 @@ package() {
   for i in $skywirescripts; do
     cp $srcdir/go/$pkgname1-scripts/$i $pkgdir/usr/bin/$i
   done
+	#install the system.d service
+	install -Dm644 $srcdir/go/$pkgname1-manager.service ${pkgdir}/usr/lib/systemd/system/$pkgname1-manager.service
+	install -Dm644 $srcdir/go/$pkgname1-node.service ${pkgdir}/usr/lib/systemd/system/$pkgname1-node.service
 }