update to latest release, version 0.5.1

1 files changed, 28 insertions, 62 deletions

diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index bd55553b79ef..3f27f68fc081 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -10,24 +10,23 @@ _pkgarch=$(dpkg --print-architecture)
 #leave arch package as any
 arch=('any')
 #manually version for now
-_pkgver='0.4.0'
-#_tag_ver='v0.4.0'
-pkgver=${_pkgver}
-_pkgrel=1
+pkgver='0.5.1'
+_pkgver=${pkgver}
+pkgrel=1
+_pkgrel=${pkgrel}
 #pkgrel=1
-pkgrel=${_pkgrel}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 url="https://${_pkggopath}"
 license=()
-#make deps for every architecture are included here..
-makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring')
+makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl')
 depends=()
-_debdeps="reprepro"
-#_debdeps=""
+_debdeps=""
+#_debdeps="reprepro"
 _scripts="skywire-deb-scripts"
-source=("git+${url}.git#branch=${BRANCH:-develop}"
+#source=("git+${url}.git#branch=${BRANCH:-develop}"
+source=( "${url}/archive/refs/tags/v${pkgver}.tar.gz"
 "${_scripts}.tar.gz"  )
-sha256sums=('SKIP'
+sha256sums=('f76bba50525c2057a9aba5d3a1fe95d1913890a19bc7ad2ff9113b278bf8d489'
             'f993e28400f72a05500f0b091d6d308c5a4a1299a2490ff0ecb5b59b0805e5b1')
 
 #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts
@@ -36,14 +35,15 @@ sha256sums=('SKIP'
 prepare() {
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
 	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarch} ${srcdir}/go/apps.${_pkgarch}
-  ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
+  ln -rTsf ${srcdir}/${_pkgname}-${_pkgver} ${srcdir}/go/src/${_pkggopath}
+  ln -rTsf ${srcdir}/${_pkgname}-${_pkgver} ${srcdir}/${_pkgname}
   cd ${srcdir}/go/src/${_pkggopath}/
 }
 
 build() {
 local GOPATH=${srcdir}/go
-local GOBIN=${GOPATH}/bin.${_pkgarch}
-local _GOAPPS=${GOPATH}/apps.${_pkgarch}
+local GOBIN=${GOPATH}/bin
+local _GOAPPS=${GOPATH}/apps
 local GOOS=linux
 export CC=musl-gcc
 
@@ -73,36 +73,15 @@ sha256sum $(ls)
 
 ### CONTROL FILES CREATION ###
 #create control file for the debian package
-echo "Package: skywire" > ${srcdir}/${_pkgarch}.control
-echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/${_pkgarch}.control
-echo "Priority: optional" >> ${srcdir}/${_pkgarch}.control
-echo "Section: web" >> ${srcdir}/${_pkgarch}.control
-echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.control
-echo "Depends: ${_debdeps}" >> ${srcdir}/${_pkgarch}.control
-echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.control
-echo "Description: ${pkgdesc}" >> ${srcdir}/${_pkgarch}.control
-
-#create control file for the hypervisorkey debian package
-echo "Package: hypervisorkey" > ${srcdir}/${_pkgarch}.hypervisorkey.control
-#TO DO: revise versioning for satellite packages
-echo "Version: 1" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-echo "Priority: optional" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-echo "Section: web" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-echo "Depends: ${_pkgname}" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-echo "Description: package for the hypervisor key" >> ${srcdir}/${_pkgarch}.hypervisorkey.control
-
-#create control file for the skywire-save debian package
-echo "Package: skywire-save" > ${srcdir}/${_pkgarch}.skywire-save.control
-#TO DO: revise versioning for satellite packages
-echo "Version: 1" >> ${srcdir}/${_pkgarch}.skywire-save.control
-echo "Priority: optional" >> ${srcdir}/${_pkgarch}.skywire-save.control
-echo "Section: web" >> ${srcdir}/${_pkgarch}.skywire-save.control
-echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.skywire-save.control
-echo "Depends: ${_pkgname}" >> ${srcdir}/${_pkgarch}.skywire-save.control
-echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.skywire-save.control
-echo "Description: easy backup and restore skywire configuration" >> ${srcdir}/${_pkgarch}.skywire-save.control
+echo "Package: skywire" > ${srcdir}/control
+echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/control
+echo "Priority: optional" >> ${srcdir}/control
+echo "Section: web" >> ${srcdir}/control
+echo "Architecture: ${_pkgarch}" >> ${srcdir}/control
+echo "Depends: ${_debdeps}" >> ${srcdir}/control
+echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/control
+echo "Description: ${pkgdesc}" >> ${srcdir}/control
+
 }
 
 #speed up the build for testing - there's a risk of using old binaries.
@@ -145,18 +124,18 @@ cd $_pkgdir
 
 _msg2 'installing binaries'
 #loop to install the binaries
-_skywirebins=$( ls ${srcdir}/go/bin.${_pkgarch} )
+_skywirebins=$( ls ${srcdir}/go/bin )
 for i in ${_skywirebins}; do
   _msg2 "$i"
-  _install2 ${srcdir}/go/bin.${_pkgarch}/${i} ${_skybin}
+  _install2 ${srcdir}/go/bin/${i} ${_skybin}
 done
 
 _msg2 'installing apps'
 #loop to install the apps
-_skywireapps=$( ls ${srcdir}/go/apps.${_pkgarch} )
+_skywireapps=$( ls ${srcdir}/go/apps )
 for i in ${_skywireapps}; do
   _msg2 "$i"
-  _install2 ${srcdir}/go/apps.${_pkgarch}/${i} ${_skyapps}
+  _install2 ${srcdir}/go/apps/${i} ${_skyapps}
 done
 
 
@@ -180,21 +159,8 @@ ln -rTsf ${_pkgdir}/${_skydir}/ssl/generate.sh ${_pkgdir}/usr/bin/skywire-tls-ge
 install -Dm644 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
 #install -Dm644 ${srcdir}/${_scripts}/ssl/certificate.cnf ${_pkgdir}/${_skydir}/ssl/certificate.cnf
 
-_msg2 'installing `hypervisorkey` control file and postinst script'
-install -Dm755  ${srcdir}/${_pkgarch}.hypervisorkey.control  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/control
-install -Dm755  ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.postinst  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/postinst
-install -Dm755  ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.postrm  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/postrm
-
-_msg2 'installing `skywire-save` control file and postinst postrm and script'
-install -Dm755  ${srcdir}/${_pkgarch}.skywire-save.control  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/control
-install -Dm755  ${srcdir}/${_scripts}/skywire-save/skywire-save.postinst  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postinst
-install -Dm755  ${srcdir}/${_scripts}/skywire-save/skywire-save.postrm  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postrm
-
-_msg2 'installing skycache systemd services'
-install -Dm644 ${srcdir}/${_scripts}/skycache/skycache.service ${_pkgdir}/${_systemddir}/skycache.service
-
 _msg2 'installing skywire control file, postinst & postrm scripts'
-install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control
+install -Dm755 ${srcdir}/control ${_pkgdir}/DEBIAN/control
 install -Dm755 ${srcdir}/${_scripts}/postinst.sh ${_pkgdir}/DEBIAN/postinst
 install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm