add .SRCINFO & PKGBUILD

2 files changed, 16 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8654c711e0ea..98d1c8f03010 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.com
 	pkgver = autogenerated
-	pkgrel = 3
+	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	arch = any
 	makedepends = dep
diff --git a/PKGBUILD b/PKGBUILD
index cff43020120d..4fecbbeca06f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname1=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.com"
 pkgver='autogenerated'
 pkggopath="github.com/${projectname}/${pkgname1}"
-pkgrel=3
+pkgrel=1
 arch=('any')
 url="https://${pkggopath}"
 license=()
@@ -78,16 +78,9 @@ cd ${srcdir}/go/${pkgname1}-scripts
 echo -e '#!/bin/bash
 #launch skywire manager with nohup using new discovery server: discovery.skycoin.com
 skywire-manager-nohup
-skywire-node-nohup-com
-echo "skywire has started"' > ${pkgname1}-com
-chmod +x ${pkgname1}-com
-
-echo -e '#!/bin/bash
-#launch skywire manager with nohup using old discovery server: discovery.skycoin.net
-skywire-manager-nohup
-skywire-node-nohup-net
-echo "skywire has started"' > ${pkgname1}-net
-chmod +x ${pkgname1}-net
+skywire-node-nohup
+echo "skywire has started"' > ${pkgname1}
+chmod +x ${pkgname1}
 
 echo -e '#!/bin/bash
 #launch skywire manager with nohup
@@ -100,47 +93,25 @@ echo -e '#!/bin/bash
 #launch skywire node with nohup & discovery server: discovery.skycoin.com
 export GOBIN=/usr/lib/skycoin/go/bin
 export GOPATH=/usr/lib/skycoin/go
-nohup skywire-node -connect-manager -manager-address 127.0.0.1:5998 -manager-web 127.0.0.1:8000 -discovery-address discovery.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-echo "skywire-node has started"' > ${pkgname1}-node-nohup-com
-  chmod +x ${pkgname1}-node-nohup-com
-	echo -e '#!/bin/bash
-	#launch skywire node with nohup & discovery server: discovery.skycoin.net
-	export GOBIN=/usr/lib/skycoin/go/bin
-	export GOPATH=/usr/lib/skycoin/go
-	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-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-	echo "skywire-node has started"' > ${pkgname1}-node-nohup-net
-	  chmod +x ${pkgname1}-node-nohup-net
+nohup skywire-node -connect-manager -manager-address 127.0.0.1:5998 -manager-web 127.0.0.1:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
+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
 #launch skywire official node with nohup & discovery server: discovery.skycoin.com
 export GOBIN=/usr/lib/skycoin/go/bin
 export GOPATH=/usr/lib/skycoin/go
-nohup skywire-node -connect-manager -manager-address 192.168.0.2:5998 -manager-web 192.168.0.2:8000 -discovery-address discovery.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-echo "skywire-node has started"' > ${pkgname1}-node-miner-com
-  chmod +x ${pkgname1}-node-miner-com
-
-	echo -e '#!/bin/bash
-#launch skywire official node with nohup  & discovery server: discovery.skycoin.net
-export GOBIN=/usr/lib/skycoin/go/bin
-export GOPATH=/usr/lib/skycoin/go
-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-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-echo "skywire-node has started"' > ${pkgname1}-node-miner-net
-  chmod +x ${pkgname1}-node-miner-net
+nohup skywire-node -connect-manager -manager-address 192.168.0.2:5998 -manager-web 192.168.0.2:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
+echo "skywire-node has started"' > ${pkgname1}-node-miner
+  chmod +x ${pkgname1}-node-miner
 
 	echo -e '#!/bin/bash
 	#launch skywire qubes node with nohup  & discovery server: discovery.skycoin.com
 	export GOBIN=/usr/lib/skycoin/go/bin
 	export GOPATH=/usr/lib/skycoin/go
-	nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address discovery.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-	echo "skywire-node has started"' > ${pkgname1}-node-qubes-com
-	  chmod +x ${pkgname1}-node-qubes-com
-		echo -e '#!/bin/bash
-		#launch skywire qubes node with nohup  & discovery server: discovery.skycoin.net
-		export GOBIN=/usr/lib/skycoin/go/bin
-		export GOPATH=/usr/lib/skycoin/go
-		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-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-		echo "skywire-node has started"' > ${pkgname1}-node-qubes-net
-		  chmod +x ${pkgname1}-node-qubes-net
+	nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
+	echo "skywire-node has started"' > ${pkgname1}-node-qubes
+	  chmod +x ${pkgname1}-node-qubes
 #script to set a custom manager IP address at runtime
 	echo -e '#!/bin/bash
 #launch skywire official node with nohup and a custom IP
@@ -148,7 +119,7 @@ read -p "Skywire Manager IP:" SKYMGRIP
 echo "Skywire manager set to $SKYMGRIP"
 export GOBIN=/usr/lib/skycoin/go/bin
 export GOPATH=/usr/lib/skycoin/go
-nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address discovery.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
+nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
 echo "skywire-node has started"' > ${pkgname1}-node-setip
  chmod +x ${pkgname1}-node-setip
 #script to set a custom manager IP address at boot to be used with the system.d service.
@@ -156,7 +127,7 @@ echo "skywire-node has started"' > ${pkgname1}-node-setip
 #launch skywire official node with nohup and a custom IP
 export GOBIN=/usr/lib/skycoin/go/bin
 export GOPATH=/usr/lib/skycoin/go
-nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address discovery.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
+nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
 echo "skywire-node has started"' > ${pkgname1}-node-envip
 	chmod +x ${pkgname1}-node-envip
 
@@ -252,11 +223,6 @@ skywirescripts=$( ls ${srcdir}/go/${pkgname1}-scripts )
 for i in ${skywirescripts}; do
   cp ${srcdir}/go/${pkgname1}-scripts/${i} ${pkgdir}/usr/bin/${i}
 done
-#link the start script for the new discovery server
-ln -s ${pkgdir}/usr/bin/${pkgname1}-com ${pkgdir}/usr/bin/${pkgname1}
-ln -s ${pkgdir}/usr/bin/${pkgname1}-node-nohup-com ${pkgdir}/usr/bin/${pkgname1}-node-nohup
-ln -s ${pkgdir}/usr/bin/${pkgname1}-node-miner-com ${pkgdir}/usr/bin/${pkgname1}-node-miner
-ln -s ${pkgdir}/usr/bin/${pkgname1}-node-qubes-com ${pkgdir}/usr/bin/${pkgname1}-node-qubes
 #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