fix web dir path relative to startup script

2 files changed, 60 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5363ce86997d..768e5e546ae2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.net
-	pkgver = autogenerated
-	pkgrel = 5
+	pkgver = 20190405.770_d87171b
+	pkgrel = 1
 	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
 	makedepends = gcc
+	provides = skywire
+	conflicts = skywire-mainnet
 	source = git+https://github.com/skycoin/skywire.git#branch=master
 	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 913dfae8f2a5..373f2ca87467 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,47 @@
 # Maintainer: Steve Skydev <steve@skycoin.net>
 projectname=skycoin
 pkgname=skywire
+pkgname1=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.net"
-pkgver='autogenerated'
-pkggopath="github.com/$projectname/$pkgname"
-pkgrel=5
-arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
+pkgver=20190405.770_d87171b
+pkggopath="github.com/$projectname/$pkgname1"
+pkgrel=1
+arch=('any')
 url="https://${pkggopath}"
 license=()
 makedepends=(dep git go gcc)
+provides=('skywire')
+conflicts=('skywire-mainnet')
 source=("git+${url}.git#branch=${BRANCH:-master}")
 sha256sums=('SKIP')
 validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')
 
+export GOOS=linux
+export GOPATH="$srcdir"
+export GOROOT="$builddir"
+export GOBIN="$GOROOT"/bin
+export GOROOT_FINAL=/usr/lib/$pkgname1
+
+export CGO_ENABLED=0
+
+case "$CARCH" in
+x86)      export GOARCH="386" GO386="387" ;;
+x86_64)   export GOARCH="amd64" ;;
+arm*)     export GOARCH="arm" ;;
+armel)    export GOARCH="arm" GOARM="5" ;;
+armhf)    export GOARCH="arm" GOARM="6" ;;
+armv7)    export GOARCH="arm" GOARM="7" ;;
+armv8)    export GOARCH="arm64" ;;
+aarch64)  export GOARCH="arm64" ;;
+mips)     export GOARCH="mips" ;;
+mips64)   export GOARCH="mips64" ;;
+mips64el) export GOARCH="mips64le" ;;
+mipsel)   export GOARCH="mipsle" ;;
+*)        return 1 ;;
+	esac
+
 pkgver() {
-	cd "$srcdir/$pkgname"
+	cd "$srcdir/$pkgname1"
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
 	local count=$(git rev-list --count HEAD)
 	local commit=$(git rev-parse --short HEAD)
@@ -24,10 +51,10 @@ pkgver() {
 
 prepare() {
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
-mkdir -p $srcdir/go/src/${pkggopath//$pkgname/} $srcdir/go/bin
-ln -rTsf $srcdir/$pkgname $srcdir/go/src/$pkggopath
+mkdir -p $srcdir/go/src/${pkggopath//$pkgname1/} $srcdir/go/bin
+ln -rTsf $srcdir/$pkgname1 $srcdir/go/src/$pkggopath
 cd $srcdir/go/src/$pkggopath/cmd
-
+git checkout master
 git submodule --quiet update --init --recursive
 
 export GOPATH="$srcdir"/go
@@ -49,27 +76,27 @@ go install \
   -ldflags "-extldflags $LDFLAGS" \
   -v ./...
 
-  msg 2 'creating launcher scripts: skywire skywire-manager skywire-manager-nohup skywire-node-nohup skywire-node-miner skywire-node-qubes'
-  mkdir -p $srcdir/go/$pkgname-scripts
-  cd $srcdir/go/$pkgname-scripts
+  msg 2 'creating launcher scripts for skywire'
+  mkdir -p $srcdir/go/$pkgname1-scripts
+  cd $srcdir/go/$pkgname1-scripts
 
-  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/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
-  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"' > $pkgname-node-miner
-  chmod +x $pkgname-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"' > $pkgname-node-qubes
-  chmod +x $pkgname-node-qubes
+  echo -e '#!/bin/bash \n #launch skywire manager with nohup \n skywire-manager-nohup \n skywire-node-nohup \n echo "skywire has started"' > $pkgname1
+  chmod +x $pkgname1
+  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"' > $pkgname1-manager-nohup
+  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
+  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
 }
 package() {
   options=(!strip staticlibs)
   #create directory trees
   mkdir -p $pkgdir/usr/bin
   mkdir -p $pkgdir/usr/lib/$projectname/go/bin
-  mkdir -p $pkgdir/usr/lib/$projectname/$pkgname/
+  mkdir -p $pkgdir/usr/lib/$projectname/$pkgname1/
   #restate go envs
   export GOPATH=$pkgdir/usr/lib/$projectname/go
   export GOBIN=$pkgdir/usr/lib/$projectname/go/bin
@@ -88,12 +115,13 @@ package() {
 	  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
-  cp -r $srcdir/$pkgname/docs/api $pkgdir/usr/share/doc/$projectname/$pkgname
+  cp -r $srcdir/$pkgname1/static $pkgdir/usr/lib/$projectname/$pkgname1/
+	mkdir -p $pkgdir/usr/share/doc/$projectname/$pkgname1
+	#install the docs
+  cp -r $srcdir/$pkgname1/docs/api $pkgdir/usr/share/doc/$projectname/$pkgname1-manager
   #install the scripts
-  skywirescripts=$( ls $srcdir/go/$pkgname-scripts )
+  skywirescripts=$( ls $srcdir/go/$pkgname1-scripts )
   for i in $skywirescripts; do
-    cp $srcdir/go/$pkgname-scripts/$i $pkgdir/usr/bin/$i
+    cp $srcdir/go/$pkgname1-scripts/$i $pkgdir/usr/bin/$i
   done
 }