fix names / paths

2 files changed, 39 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51d3aa02857c..f7ce0370f42c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.net
 	pkgver = autogenerated
-	pkgrel = 7
+	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	arch = any
 	makedepends = dep
diff --git a/PKGBUILD b/PKGBUILD
index fea4bc6eee11..97e17fc3426d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname1=skywire
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.net"
 pkgver='autogenerated'
 pkggopath="github.com/$projectname/$pkgname1"
-pkgrel=7
+pkgrel=1
 arch=('any')
 url="https://${pkggopath}"
 license=()
@@ -40,7 +40,7 @@ mips64el) export GOARCH="mips64le" ;;
 mipsel)   export GOARCH="mipsle" ;;
 *)        return 1 ;;
 	esac
-	
+
 pkgver() {
 	cd "$srcdir/$pkgname1"
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
@@ -103,41 +103,40 @@ go install \
 }
 
 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/$pkgname1/
-  #restate go envs
-  export GOPATH=$pkgdir/usr/lib/$projectname/go
-  export GOBIN=$pkgdir/usr/lib/$projectname/go/bin
-  #install binaries & symlink to /usr/bin
-	msg2 'installing binaries'
-	skybins="$srcdir"/go/bin
-	#avoid generic names for binaries
-	potentialnameconflicts=$( ls --ignore=skywire* "$skybins")
-	cd $skybins
-  for i in $potentialnameconflicts; do
-    mv $skybins/$i $skybins/$pkgname1-$i
-  done
-	#collect the binaries & install
-	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/$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/$pkgname1-scripts )
-  for i in $skywirescripts; do
-    cp $srcdir/go/$pkgname1-scripts/$i $pkgdir/usr/bin/$i
-  done
-	#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
+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/$pkgname1/
+#restate go envs
+export GOPATH=$pkgdir/usr/lib/$projectname/go
+export GOBIN=$pkgdir/usr/lib/$projectname/go/bin
+#install binaries & symlink to /usr/bin
+msg2 'installing binaries'
+skybins=$srcdir/go/bin
+skybins1=$pkgdir/usr/lib/$projectname/go/bin/
+#collect the binaries & install
+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/$pkgname1-$i
+	chmod 755 $pkgdir/usr/bin/$pkgname1-$i
+done
+mv $pkgdir/usr/bin/$pkgname1-$pkgname1-manager $pkgdir/usr/bin/$pkgname1-manager
+chmod 755 $pkgdir/usr/bin/$pkgname1-manager
+mv $pkgdir/usr/bin/$pkgname1-$pkgname1-node $pkgdir/usr/bin/$pkgname1-node
+chmod 755 $pkgdir/usr/bin/$pkgname1-node
+#install the web dir
+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/$pkgname1-scripts )
+for i in $skywirescripts; do
+  cp $srcdir/go/$pkgname1-scripts/$i $pkgdir/usr/bin/$i
+done
+#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
 }