bump pkgrel; touchups

2 files changed, 17 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5708134985de..5e0022525341 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.net
-	pkgver = autogenerated
-	pkgrel = 2
+	pkgver = 20190405.770_d87171b
+	pkgrel = 3
 	url = https://github.com/skycoin/skywire
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 718282a17180..974e53daae89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 projectname=skycoin
 pkgname=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.net"
-pkgver='autogenerated'
+pkgver=20190405.770_d87171b
 pkggopath="github.com/$projectname/$pkgname"
-pkgrel=2
+pkgrel=3
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
 url="https://${pkggopath}"
 license=()
@@ -64,9 +64,7 @@ go install \
   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"' > $pkgname-node-qubes
   chmod +x $pkgname-node-qubes
 }
-
 package() {
-  msg2 'installing files'
   options=(!strip staticlibs)
   #create directory trees
   mkdir -p $pkgdir/usr/bin
@@ -76,24 +74,19 @@ package() {
   export GOPATH=$pkgdir/usr/lib/$projectname/go
   export GOBIN=$pkgdir/usr/lib/$projectname/go/bin
   #install binaries & symlink to /usr/bin
-  install -Dm755 $srcdir/go/bin/skywire-manager $pkgdir/usr/lib/$projectname/go/bin/skywire-manager
-  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/skywire-manager $pkgdir/usr/bin/skywire-manager
-  chmod 755 $pkgdir/usr/bin/skywire-manager
-  install -Dm755 $srcdir/go/bin/skywire-node $pkgdir/usr/lib/$projectname/go/bin/skywire-node
-  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/skywire-node $pkgdir/usr/bin/skywire-node
-  chmod 755 $pkgdir/usr/bin/skywire-node
-  install -Dm755 $srcdir/go/bin/sockss $pkgdir/usr/lib/$projectname/go/bin/sockss
-  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/sockss $pkgdir/usr/bin/skywire-sockss
-  chmod 755 $pkgdir/usr/bin/skywire-sockss
-  install -Dm755 $srcdir/go/bin/socksc $pkgdir/usr/lib/$projectname/go/bin/socksc
-  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/socksc $pkgdir/usr/bin/skywire-socksc
-  chmod 755 $pkgdir/usr/bin/skywire-socksc
-  install -Dm755 $srcdir/go/bin/sshs $pkgdir/usr/lib/$projectname/go/bin/sshs
-  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/sshs $pkgdir/usr/bin/skywire-sshs
-  chmod 755 $pkgdir/usr/bin/skywire-sshs
-  install -Dm755 $srcdir/go/bin/sshc $pkgdir/usr/lib/$projectname/go/bin/sshc
-  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/sshc $pkgdir/usr/bin/skywire-sshc
-  chmod 755 $pkgdir/usr/bin/skywire-sshc
+	msg2 'installing binaries'
+	skybins="$srcdir"/go/bin
+	potentialnameconflicts=$( ls --ignore=skywire* "$skybins")
+	cd $skybins
+  for i in $potentialnameconflicts; do
+    mv $skybins/$i $skybins/$pkgname1-$i
+  done
+	skywirebins=$( ls "$skybins")
+	for i in $skywirebins; do
+	  install -Dm755 $srcdir/go/bin/$i $pkgdir/usr/lib/$projectname/go/bin/$i
+	  ln -rTsf $pkgdir/usr/lib/$projectname/go/bin/$i $pkgdir/usr/bin/$i
+	  chmod 755 $pkgdir/usr/bin/$i
+  done
   #install the web dir
   cp -r $srcdir/$pkgname/static $pkgdir/usr/lib/$projectname/$pkgname/
   mkdir -p $pkgdir/usr/share/doc/$projectname/$pkgname