fix name conflict & scripts; increment pkgrel

2 files changed, 22 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af76a3aa750d..5708134985de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.net
 	pkgver = autogenerated
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/skycoin/skywire
 	arch = x86_64
 	arch = i686
 	arch = armv6h
 	arch = armv7h
 	arch = aarch64
-	license = MIT
 	makedepends = dep
 	makedepends = git
 	makedepends = go
diff --git a/PKGBUILD b/PKGBUILD
index c6b13621945b..718282a17180 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,15 @@ pkgname=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.net"
 pkgver='autogenerated'
 pkggopath="github.com/$projectname/$pkgname"
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
 url="https://${pkggopath}"
-license=(MIT)
+license=()
 makedepends=(dep git go gcc)
 source=("git+${url}.git#branch=${BRANCH:-master}")
 sha256sums=('SKIP')
 validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')
 
-export GOOS=linux
-case "$CARCH" in
-  x86_64) export GOARCH=amd64 ;;
-esac
-export GOROOT_FINAL=/usr/lib/go
-export GOPATH_FINAL=$HOME/go
-export GOBIN_FINAL=$HOME/go/bin
 pkgver() {
 	cd "$srcdir/$pkgname"
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
@@ -62,7 +55,7 @@ go install \
 
   echo -e '#!/bin/bash \n #launch skywire manager with nohup \n skywire-manager-nohup \n skywire-node-nohup \n echo "skywire has started"' > $pkgname
   chmod +x $pkgname
-  echo -e '#!/bin/bash \n #launch skywire manager with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-manager -web-dir /usr/lib/skycoin/skywire/static/skywire-manager > /dev/null 2>&1 &sleep 3 \n echo "skywire-manager has started"' > $pkgname-manager-nohup
+  echo -e '#!/bin/bash \n #launch skywire manager with nohup \n export GOBIN=/usr/lib/skycoin/go/bin \n export GOPATH=/usr/lib/skycoin/go \n nohup skywire-manager -web-dir /usr/lib/skycoin/skywire/skywire-manager > /dev/null 2>&1 &sleep 3 \n echo "skywire-manager has started"' > $pkgname-manager-nohup
   chmod +x $pkgname-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"' > $pkgname-node-nohup
   chmod +x $pkgname-node-nohup
@@ -79,25 +72,28 @@ package() {
   mkdir -p $pkgdir/usr/bin
   mkdir -p $pkgdir/usr/lib/$projectname/go/bin
   mkdir -p $pkgdir/usr/lib/$projectname/$pkgname1/
-  #putting the sources in /usr/lib/skycoin/skywire
-  cp -r $srcdir/$pkgname1/ $pkgdir/usr/lib/$projectname/
   #restate go envs
   export GOPATH=$pkgdir/usr/lib/$projectname/go
   export GOBIN=$pkgdir/usr/lib/$projectname/go/bin
-  #mke sure all the binaries are prepended with 'skywire-'
-  skybins="$srcdir"/go/bin
-  cd $skybins
-  mv socksc skywire-socksc
-  mv sockss skywire-sockss
-  mv sshc skywire-sshc
-  mv sshs skywire-sshs
   #install binaries & symlink to /usr/bin
-  skywirebins=$( ls $srcdir/go/bin/ )
-  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 -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
   #install the web dir
   cp -r $srcdir/$pkgname/static $pkgdir/usr/lib/$projectname/$pkgname/
   mkdir -p $pkgdir/usr/share/doc/$projectname/$pkgname