add deb.PKGBUILD and skywire-deb-scripts.tar.gz; minor asthetic changes to PKGBUILD

1 files changed, 16 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b85566f83ad9..a91b4879a9f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,19 +8,22 @@ pkgdesc="Skywire Mainnet Node implementation. Develop Banch. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='autogenerated'
 #pkgver='autogenerated'
-pkgrel=9
-#pkgrel=9
+pkgrel=10
+#pkgrel=10
 arch=('any')
 url="https://${_pkggopath}"
 license=()
 makedepends=(git go skycoin-keyring)
 optdepends=('readonly-cache: distribute hypervisorkey package for cluster management')
 install=skywire.install
+_scripts=skywire-scripts
 source=("git+${url}.git#branch=${BRANCH:-develop}"
-"skywire-scripts.tar.gz"
-"PKGBUILD.sig")
+"${_scripts}.tar.gz"
+'PKGBUILD.sig'
+'PKGBUILD')
 sha256sums=('SKIP'
             'dc60e6caf24a4e74d3810d993c1c5343488784b33d61f7f6ab20aded95473ffa'
+            'SKIP'
             'SKIP')
 validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
 #'98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
@@ -57,7 +60,7 @@ pkgver() {
 
 prepare() {
 	#verify PKGBUILD signature
-	gpg --verify ../PKGBUILD.sig ../PKGBUILD
+	gpg --verify ${srcdir}/PKGBUILD.sig ${srcdir}/PKGBUILD
 
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
 	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
@@ -136,13 +139,13 @@ package() {
     ln -rTsf ${pkgdir}/${_skydir}/apps/${i} ${pkgdir}/usr/bin/${i}
   done
   #install scripts
-  install -Dm755 ${srcdir}/${_pkgname}-scripts/skywire-halt.sh ${pkgdir}/usr/bin/skywire-halt
-  install -Dm755 ${srcdir}/${_pkgname}-scripts/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
+  install -Dm755 ${srcdir}/${_scripts}/skywire-halt.sh ${pkgdir}/usr/bin/skywire-halt
+  install -Dm755 ${srcdir}/${_scripts}/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
 
   #install the satellite PKGBUILD for distributing the hypervisor key and it's script
-  install -Dm755 ${srcdir}/${_pkgname}-scripts/keypkg-gen.sh ${pkgdir}/usr/bin/keypkg-gen
-  install -Dm755  ${srcdir}/${_pkgname}-scripts/hypervisorkey.PKGBUILD  ${pkgdir}/opt/${_pkgname}/hypervisorkey/PKGBUILD
-  install -Dm755 ${srcdir}/${_pkgname}-scripts/hypervisorkey.install ${pkgdir}/opt/${_pkgname}/hypervisorkey/hypervisorkey.install
+  install -Dm755 ${srcdir}/${_scripts}/keypkg-gen.sh ${pkgdir}/usr/bin/keypkg-gen
+  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}
@@ -151,12 +154,12 @@ package() {
   #install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service
 
   #install the patched system.d services
-  install -Dm644 ${srcdir}/${_pkgname}-scripts/${_pkgname}.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}.service
-  install -Dm644 ${srcdir}/${_pkgname}-scripts/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service
+  install -Dm644 ${srcdir}/${_scripts}/${_pkgname}.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}.service
+  install -Dm644 ${srcdir}/${_scripts}/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service
 
   #tls key and certificate generation
   #install -Dm755 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/generate-1.sh ${pkgdir}/${_skydir}/ssl/generate.sh
-  install -Dm755 ${srcdir}/${_pkgname}-scripts/generate.sh ${pkgdir}/${_skydir}/ssl/generate.sh
+  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