update to 0.4.0 ; add .deb cross-compiling PKGBUILD

1 files changed, 43 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a7a63f19cbee..5a387fb2c01d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=${_pkgname}-bin
 _projectname=skycoin
 _githuborg=${_projectname}
 pkgdesc="Skywire: Building a New Internet. Skycoin.com"
-_pkgver='0.3.0'
+_pkgver='0.4.0'
 _tag_ver="v${_pkgver}"
 pkgver=${_pkgver//-/.}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
@@ -16,11 +16,19 @@ makedepends=()
 depends=()
 provides=( 'skywire' )
 conflicts=( 'skywire' )
-#install=skywire.install
+install=skywire.install
 _scripts=${_pkgname}-scripts
-#source=("${_scripts}.tar.gz" )
+source=("${_scripts}.tar.gz" )
 # "PKGBUILD.sig")
-#sha256sums=('fff8b9f7d4e60c8993497a963161f934d445f4d7cf2ff47bc787dcb459c8b351')
+sha256sums=('2994b9816389300da84de6880aa531a5eedc4ad2d4da693ee371d0f61ff8a38b')
+sha256sums_i686=('3e48f0e13ace81d5652a76a9d7bcf82108535095a3e3e076843012462cc107d2')
+sha256sums_x86_64=('8d00dcce4d1ced77ba6f5f24f855e2640a528fa0ae4a34a433268ce34e3d13c1')
+sha256sums_aarch64=('23b76001bb8f8e2f3dadaaf71addaa69eb55a29aa69c0f426827d60ddc3738d6')
+sha256sums_armv8=('23b76001bb8f8e2f3dadaaf71addaa69eb55a29aa69c0f426827d60ddc3738d6')
+sha256sums_armv7=('1e30babe08399c4a8330102c20432465b8cdf4a83eb6c475c389f9fd4b3decbc')
+sha256sums_armv7l=('1e30babe08399c4a8330102c20432465b8cdf4a83eb6c475c389f9fd4b3decbc')
+sha256sums_armv7h=('1e30babe08399c4a8330102c20432465b8cdf4a83eb6c475c389f9fd4b3decbc')
+sha256sums_arm=('1e30babe08399c4a8330102c20432465b8cdf4a83eb6c475c389f9fd4b3decbc')
 #            'SKIP')
 #https://github.com/skycoin/skywire/releases/download/v0.3.0/skywire-v0.3.0-linux-amd64.tar.gz
 #https://github.com/skycoin/skywire/releases/download/v0.3.0/skywire-v0.3.0-linux-386.tar.gz
@@ -35,17 +43,6 @@ source_armv7=( ${source_arm[@]} )
 source_armv7l=( ${source_arm[@]} )
 source_armv7h=( ${source_arm[@]} )
 source_i686=("${_release_url}-386.tar.gz")
-sha256sums_x86_64=('dffd28740b051bf07764fa254bf2be15a56dfd6390860541f660aef03fe71856')
-sha256sums_aarch64=('ac8cadc15a506f324718cdc9a549ccefa9459e88367441361a6395d330bfcf8b')
-sha256sums_armv8=( ${sha256sums_aarch64[@]} )
-sha256sums_arm=('271e6f175ee3382287929ff0eb298712427d64f4cfb930b3b75277a3ace500b2')
-sha256sums_armv7=( ${sha256sums_arm[@]} )
-sha256sums_armv7l=( ${sha256sums_arm[@]} )
-sha256sums_armv7h=( ${sha256sums_arm[@]} )
-sha256sums_i686=('d74b659aca0e3b90c05cf2b31de9bdbd44f6a4a69a4a0a083f7c44454be3012a')
-
-# validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
-#'98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
 
 #tar -czvf skywire-scripts.tar.gz skywire-scripts
 #updpkgsums
@@ -61,6 +58,7 @@ _msg2 'creating dirs'
 #create directory trees or the visor might make them with weird permissions
 _skydir="opt/skywire"
 _skyapps="${_skydir}/apps"
+_skyscripts="${_skydir}/scripts"
 _systemddir="etc/systemd/system"
 _skybin="${_skydir}/bin"
 mkdir -p ${pkgdir}/usr/bin
@@ -72,14 +70,12 @@ mkdir -p ${pkgdir}/${_skydir}/dmsgpty
 mkdir -p ${pkgdir}/${_skydir}/${_pkgname}
 #mkdir -p ${pkgdir}/${_skydir}/${_pkgname}-save
 mkdir -p ${pkgdir}/${_skydir}/transport_logs
-#mkdir -p ${pkgdir}/${_skydir}/sky-local
-#mkdir -p ${pkgdir}/${_skydir}/hypervisorkey
+#mkdir -p ${pkgdir}/${_skydir}/skycache
+mkdir -p ${pkgdir}/${_skydir}/hypervisorkey
+mkdir -p ${pkgdir}/${_skydir}/scripts
 
 
 _msg2 'installing binaries'
-_msg3 'skywire-hypervisor'
-install -Dm755 ${srcdir}/hypervisor ${pkgdir}/${_skybin}/
-ln -rTsf ${pkgdir}/${_skybin}/hypervisor ${pkgdir}/usr/bin/${_pkgname}-hypervisor
 _msg3 'skywire-visor'
 install -Dm755 ${srcdir}/${_pkgname}-visor ${pkgdir}/${_skybin}/
 ln -rTsf ${pkgdir}/${_skybin}/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname}-visor
@@ -97,42 +93,47 @@ _msg3 'vpn-client'
 install -Dm755 ${srcdir}/apps/vpn-client ${pkgdir}/${_skyapps}/
 _msg3 'vpn-server'
 install -Dm755 ${srcdir}/apps/vpn-server ${pkgdir}/${_skyapps}/
+_msg2 'installing scripts'
+_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} )
+for i in ${_skywirescripts}; do
+  _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts}
+done
 
-#install scripts
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-halt.sh ${pkgdir}/usr/bin/${_pkgname}-halt
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-setuser.sh ${pkgdir}/usr/bin/${_pkgname}-setuser
-
-#install the PKGBUILD for generating the config backup (and restoration?) scripts
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-save.sh ${pkgdir}/usr/bin/${_pkgname}-save
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-restore.sh ${pkgdir}/usr/bin/${_pkgname}-restore
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-autoconfig.sh ${pkgdir}/usr/bin/${_pkgname}-autoconfig
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-reset.sh ${pkgdir}/usr/bin/${_pkgname}-reset
-
-#install -Dm755  ${srcdir}/${_scripts}/${_pkgname}-save.PKGBUILD  ${pkgdir}/${_skydir}/${_pkgname}-save/PKGBUILD
-#install -Dm755 ${srcdir}/${_scripts}/${_pkgname}-save.install ${pkgdir}/${_skydir}/${_pkgname}-save/${_pkgname}-save.install
+#install -Dm755  ${srcdir}/${_scripts}/skywire-save/${_pkgname}-save.PKGBUILD  ${pkgdir}/${_skydir}/${_pkgname}-save/PKGBUILD
+#install -Dm755 ${srcdir}/${_scripts}/skywire-save/${_pkgname}-save.install ${pkgdir}/${_skydir}/${_pkgname}-save/${_pkgname}-save.install
+#install -Dm644 ${srcdir}/${_scripts}/skywire-save/${_pkgname}-save.txt ${pkgdir}/${_skydir}/${_pkgname}-save/${_pkgname}-save.install
 
 #install the satellite PKGBUILD for distributing the hypervisor key and it's script
-#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
-#install -Dm755 ${srcdir}/${_scripts}/hypervisorkey-autoconfig.sh ${pkgdir}/${_skydir}/hypervisorkey/hypervisorkey-autoconfig.sh
+#install -Dm755  ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.PKGBUILD  ${pkgdir}/${_skydir}/hypervisorkey/PKGBUILD
+#install -Dm755 ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.install ${pkgdir}/${_skydir}/hypervisorkey/hypervisorkey.install
+#install -Dm755 ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey-autoconfig.sh ${pkgdir}/${_skydir}/hypervisorkey/hypervisorkey-autoconfig.sh
 
 #rename visor to skywire
-#mv ${pkgdir}/usr/bin/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname}
+[[ -f ${pkgdir}/usr/bin/${_pkgname}-visor ]] && mv ${pkgdir}/usr/bin/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname}
 
 #install the system.d services (from the source)
 #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
 
 #install the patched system.d services
-#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
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${pkgdir}/${_systemddir}/${_pkgname}.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${pkgdir}/${_systemddir}/${_pkgname}-visor.service
+
+#install the skycache systemd service
+#install -Dm644 ${srcdir}/${_scripts}/skycache/skycache.service ${pkgdir}/${_systemddir}/skycache.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}/${_scripts}/generate.sh ${pkgdir}/${_skydir}/ssl/generate.sh
-#ln -rTsf ${pkgdir}/${_skydir}/ssl/generate.sh ${pkgdir}/usr/bin/${_pkgname}-tls-gen
-#install -Dm644 ${srcdir}/${_pkgname}/static/${_pkgname}-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
+install -Dm755 ${srcdir}/${_scripts}/ssl/generate.sh ${pkgdir}/${_skydir}/ssl/generate.sh
+ln -rTsf ${pkgdir}/${_skydir}/ssl/generate.sh ${pkgdir}/usr/bin/${_pkgname}-tls-gen
+install -Dm644 ${srcdir}/${_scripts}/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
+}
+_install2() {
+_binname="${1##*/}"
+_binname="${_binname%%.*}"
+install -Dm755 ${1} ${pkgdir}/${2}/${_binname}
+ln -rTsf ${pkgdir}/${2}/${_binname} ${pkgdir}/usr/bin/${_binname}
+chmod +x ${pkgdir}/usr/bin/${_binname}
 }
 
 _msg2() {