fix deb.PKGBUILD; asthetic changes to PKGBUILD

1 files changed, 32 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 008cdc961c00..cc267eae590b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgdesc="Skywire Mainnet Node implementation. Develop Banch. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='autogenerated'
 #pkgver='autogenerated'
-pkgrel=12
-#pkgrel=12
+pkgrel=13
+#pkgrel=13
 arch=('any')
 url="https://${_pkggopath}"
 license=()
@@ -17,16 +17,19 @@ makedepends=('git' 'go' 'musl' 'kernel-headers-musl' 'skycoin-keyring')
 optdepends=('readonly-cache: distribute hypervisorkey package for cluster management')
 install=skywire.install
 _scripts=skywire-scripts
+#scripts need at least this commit to work if current build to develop fails
+#source=("git+${url}.git#commit=d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c"
 source=("git+${url}.git#branch=${BRANCH:-develop}"
-"${_scripts}.tar.gz"
-'PKGBUILD.sig'
-'PKGBUILD')
+"${_scripts}.tar.gz"  #)
+'PKGBUILD.sig' #comment out to disable
+'PKGBUILD')   #comment out to disable
 sha256sums=('SKIP'
-            'dc60e6caf24a4e74d3810d993c1c5343488784b33d61f7f6ab20aded95473ffa'
-            'SKIP'
-            'SKIP')
+            'dc60e6caf24a4e74d3810d993c1c5343488784b33d61f7f6ab20aded95473ffa'  #)
+            'SKIP'  #comment out to disable
+            'SKIP')   #comment out to disable
 validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
 #'98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
+
 #tar -czvf skywire-scripts.tar.gz skywire-scripts
 #updatepkgsums
 
@@ -42,7 +45,7 @@ pkgver() {
 
 prepare() {
 	#verify PKGBUILD signature
-	gpg --verify ${srcdir}/PKGBUILD.sig ${srcdir}/PKGBUILD
+	gpg --verify ${srcdir}/PKGBUILD.sig ${srcdir}/PKGBUILD   #comment out to disable signature check
 
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
 	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
@@ -57,12 +60,13 @@ build() {
   cd ${srcdir}/go/src/${_pkggopath}
   export GOOS=linux
   export CGO_ENABLED=1
+#use musl-gcc for static compilation
   export CC=musl-gcc
 
   #create the skywire binaries
   cd ${srcdir}/go/src/${_pkggopath}
   _cmddir=${srcdir}/go/src/${_pkggopath}/cmd
-  #using go build for determinism
+  #static compilation ; need to re-evaluate build determinism
   _msg2 'building skychat binary'
 	cd ${_cmddir}/apps/skychat
   go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOAPPS/ .
@@ -102,6 +106,9 @@ build() {
 package() {
   #create directory trees
   _skydir="opt/skywire"
+  _skyapps="${_skydir}/apps"
+  _systemddir="etc/systemd/system"
+  _skybin="${_skydir}/bin"
   mkdir -p ${pkgdir}/usr/bin/
   mkdir -p ${pkgdir}/${_skydir}/bin/
   mkdir -p ${pkgdir}/${_skydir}/apps/
@@ -114,16 +121,14 @@ package() {
   _msg2 'installing binaries'
   _skywirebins=$( ls ${srcdir}/go/bin )
   for i in ${_skywirebins}; do
-    install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/${_skydir}/bin/${i}
-      ln -rTsf ${pkgdir}/${_skydir}/bin/${i} ${pkgdir}/usr/bin/${i}
+    install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/${_skybin}/${i}
+      ln -rTsf ${pkgdir}/${_skybin}/${i} ${pkgdir}/usr/bin/${i}
   done
-  #check
-  #_msg2 'testing `skywire-cli visor gen-config --help`'
-  #${pkgdir}/opt/skywire/bin/skywire-cli visor gen-config --help
+
   _skywireapps=$( ls ${srcdir}/go/apps )
   for i in ${_skywireapps}; do
-    install -Dm755 ${srcdir}/go/apps/${i} ${pkgdir}/${_skydir}/apps/${i}
-    ln -rTsf ${pkgdir}/${_skydir}/apps/${i} ${pkgdir}/usr/bin/${i}
+    install -Dm755 ${srcdir}/go/apps/${i} ${pkgdir}/${_skyapps}/${i}
+    ln -rTsf ${pkgdir}/${_skyapps}/${i} ${pkgdir}/usr/bin/${i}
   done
   #install scripts
   install -Dm755 ${srcdir}/${_scripts}/skywire-halt.sh ${pkgdir}/usr/bin/skywire-halt
@@ -134,8 +139,9 @@ package() {
   install -Dm755  ${srcdir}/${_scripts}/hypervisorkey.PKGBUILD  ${pkgdir}/${_skydir}/hypervisorkey/PKGBUILD
   install -Dm755 ${srcdir}/${_scripts}/hypervisorkey.install ${pkgdir}/${_skydir}/hypervisorkey/hypervisorkey.install
 
-	cd ${pkgdir}/usr/bin/
-	mv ${_pkgname}-visor ${_pkgname}
+  #rename visor to skywire
+	mv ${pkgdir}/usr/bin/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname}
+
   #install the system.d services
   #install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-hypervisor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-hypervisor.service
   #install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service
@@ -149,7 +155,6 @@ package() {
   install -Dm755 ${srcdir}/${_scripts}/generate.sh ${pkgdir}/${_skydir}/ssl/generate.sh
   ln -rTsf ${pkgdir}/${_skydir}/ssl/generate.sh ${pkgdir}/usr/bin/skywire-tls-gen
 	install -Dm644 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
-
 }
 
 
@@ -158,3 +163,10 @@ _msg2() {
 	local mesg=$1; shift
 	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
 }
+
+
+#chck() {
+#check
+#_msg2 'testing `skywire-cli visor gen-config --help`'
+#${pkgdir}/opt/skywire/bin/skywire-cli visor gen-config --help
+#}