minor tweaks & standardization

2 files changed, 9 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 220cf0116477..e10db3996bc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,9 @@
 pkgbase = skywire-mainnet
 	pkgdesc = Skywire: Building a New Internet. Skycoin.net
 	pkgver = autogenerated
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/skycoin/skywire
-	arch = x86_64
-	arch = i686
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
+	arch = any
 	makedepends = dep
 	makedepends = git
 	makedepends = go
diff --git a/PKGBUILD b/PKGBUILD
index dfb9d23acead..726a6270fa69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ pkgname1=skywire
 pkgdesc="Skywire: Building a New Internet. Skycoin.net"
 pkgver='autogenerated'
 pkggopath="github.com/$projectname/$pkgname1"
-pkgrel=4
-arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
+pkgrel=5
+arch=('any')
 url="https://${pkggopath}"
 license=()
 makedepends=(dep git go gcc)
@@ -26,7 +26,6 @@ export GOROOT_FINAL=/usr/lib/$pkgname
 export CGO_ENABLED=0
 
 case "$CARCH" in
-
 x86)      export GOARCH="386" GO386="387" ;;
 x86_64)   export GOARCH="amd64" ;;
 arm*)     export GOARCH="arm" ;;
@@ -52,7 +51,6 @@ pkgver() {
 
 prepare() {
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
-
   mkdir -p $srcdir/go/src/${pkggopath//$pkgname1/} "$srcdir"/go/bin
   ln -rTsf $srcdir/$pkgname1 $srcdir/go/src/$pkggopath
   cd $srcdir/go/src/$pkggopath/
@@ -73,10 +71,10 @@ build() {
   export PATH=${GOPATH}/bin:${PATH}
   cd $srcdir/go/src/$pkggopath
   make build
-  make
   make install
   #user must generate default json config by running this script after install
-  echo -e '#!/bin/bash \n # this script sets up skywire after installation \n mkdir -p ~/skywire \n sudo chmod 777 ~/skywire \n sudo chmod 777 ~/apps \n cd ~/ \n ln -s /usr/lib/skycoin/skywire/apps ~/ \n skywire-cli config \n skywire-manager-node gen-config \n skywire-node skywire.json' > $srcdir/go/bin/$pkgname1-setup
+	msg 2 'creating setup script; please run skywire-seup after installation'
+  echo -e '#!/bin/bash \n # this script sets up skywire after installation \n mkdir -p ~/skywire \n sudo chmod 777 ~/skywire \n sudo chmod 777 ~/apps \n cd ~/ \n ln -s /usr/lib/skycoin/skywire/apps ~/ \n skywire-cli node gen-config -r \n skywire-manager-node gen-config -r \n skywire-manager-node \n #skywire-node skywire-config.json' > $srcdir/go/bin/$pkgname1-setup
   chmod +x $srcdir/go/bin/$pkgname1-setup
 }
 
@@ -86,14 +84,14 @@ 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
+	#putting the sources in /usr/lib/skycoin/skywire
+	cp -r $srcdir/$pkgname1/ $pkgdir/usr/lib/$projectname/
   msg2 'installing binaries'
   skybins="$srcdir"/go/bin
-  cp $skybins/manager-node $skybins/skywire-manager-node
+  cp $skybins/manager-node $skybins/$pkgname1-manager-node
   skywirebins=$( ls $skybins )
   for i in $skywirebins; do
     install -Dm755 $srcdir/go/bin/$i $pkgdir/usr/lib/$projectname/go/bin/$i