fixes & updates

1 files changed, 25 insertions, 30 deletions

diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 9e155ac002db..ce1a5821b6cc 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -8,20 +8,16 @@ pkgdesc="Skywire Mainnet Node implementation. Binary Release. Debian package"
 #set to native architecture with dpkg
 _pkgarch=$(dpkg --print-architecture)
 _pkgarches=('armhf' 'arm64' 'amd64')
-#Uncoment to select architecture - cross compile not working currently
-#_pkgarch=amd64
-#_pkgarch=arm64
-#_pkgarch=armhf
 #leave arch package as any
 arch=('any')
 #manually version for now
-_pkgver='0.4.2'
+_pkgver='0.5.0'
 _tag_ver=v${_pkgver}
 pkgver=${_pkgver}
 #pkgver='autogenerated'
 #pkgrel keeps getting reset when build is run
-_pkgrel=5
-#pkgrel=5
+_pkgrel=1
+#pkgrel=1
 pkgrel=${_pkgrel}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 url="https://${_pkggopath}"
@@ -35,20 +31,23 @@ _scripts="skywire-deb-scripts"
 #source=("git+${url}.git#branch=${BRANCH:-develop}"
 #build to needed commit because of develop branch instability
 #source=("git+${url}.git" ##branch=${BRANCH:-develop}"
-_release_url=("${url}/releases/download/${_tag_ver}/${_pkgname}-${_tag_ver}-linux")
+_binarchive=("${_pkgname}-${_tag_ver}-linux")
+_release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}")
 source=(
-#"https://github.com/asxtree/skywire-mainnet/releases/download/0.4.1/skywire-v0.4.1-linux-arm.tar.gz"
 "${_release_url}-amd64.tar.gz"
 "${_release_url}-arm64.tar.gz"
 "${_release_url}-arm.tar.gz"
 "${_scripts}.tar.gz"
 )
-#'deb.PKGBUILD.sig'   #skip the pgp checks for now as makepkg and yay handle it differently
-#'deb.PKGBUILD')
-sha256sums=('1d1a24d50c7838ae369a15ff914777c0a54352383b9b2ffd319e6a61f1bc1659'
-            'a0fc5f7b17e6e6e22b0d4fc144bf9ee19ab7d78a3fa785bbfdb5a653de936253'
-            '89956549bedcc53393895c9d37146e5423da0836acf10824a0d8b95775134737'
-            '804ac081184987460703d92c652a928e0dad58b31c451d834b3031d49daba582')
+noextract=(
+"${_binarchive}-amd64.tar.gz"
+"${_binarchive}-arm64.tar.gz"
+"${_binarchive}arm.tar.gz"
+)
+sha256sums=('382e3db67778ab551d05778b75550b114df0b0bd0c91b41aa8e59ff7473a0895'
+            '98294b08649e76f4e8df4c120cb0a642767cd781b6dee72c9fc72691fab262bb'
+            'fa7df58d8930e2547341d381283711d068c58ef960a5449427c0babe71257600'
+            '71f09a7d502e355d2998830a8a84a656f8e438c534a587df833b0eaa78af1944')
 
 build() {
   for i in ${_pkgarches[@]}; do
@@ -77,9 +76,9 @@ msg2 "_pkgarch=${i}"
 local _pkgarch=${i}
 
 if [[ $_pkgarch == "amd64" ]] ; then
-rm -rf ${srcdir}/skywire-visor ${srcdir}/skywire-cli ${srcdir}/skychat ${srcdir}/skysocks ${srcdir}/skysocks-client ${srcdir}/vpn-client ${srcdir}/vpn-server
-rm -rf ${pkgdir}/test && mkdir -p ${pkgdir}/test && cd ${pkgdir}/test
-tar -xf ${srcdir}/${_pkgname}-${_tag_ver}-linux-amd64.tar.gz
+  rm -rf ${srcdir}/skywire-visor ${srcdir}/skywire-cli ${srcdir}/apps
+  rm -rf ${pkgdir}/test && mkdir -p ${pkgdir}/test && cd ${pkgdir}/test
+  tar -xf ${srcdir}/${_pkgname}-${_tag_ver}-linux-amd64.tar.gz
 fi
 
 if [[ $_pkgarch == "arm64" ]] ; then
@@ -105,10 +104,8 @@ _systemddir="etc/systemd/system"
 _skybin="${_skydir}/bin"
 [[ -d ${_pkgdir} ]] && rm -rf ${_pkgdir}
 mkdir -p ${_pkgdir}/usr/bin ${_pkgdir}/usr/bin/apps
-#this was done at my discretion for tls autoconfig
+#tls autoconfig
 mkdir -p ${_pkgdir}/${_skydir}/ssl
-#the skeleton of the hyperviorkey package; created with a script run on target machines
-#mkdir -p ${_pkgdir}/${_skydir}/hypervisorkey/opt/${_pkgname}
 #other dirs must be created or the visor will create them at runtime with weird permissions
 mkdir -p ${_pkgdir}/${_skydir}/local
 mkdir -p ${_pkgdir}/${_skydir}/dmsgpty
@@ -136,25 +133,23 @@ ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-cli ${_pkgdir}/usr/bin/${_pkgname}-cl
 chmod +x ${_pkgdir}/usr/bin/${_pkgname}-cli
 _msg2 'installing app binaries'
 _msg3 'skychat'
-_install2 ${pkgdir}/test/skychat ${_skyapps}
-install -Dm755 ${pkgdir}/test/skychat ${_pkgdir}/${_skyapps}/skychat
+install -Dm755 ${pkgdir}/test/apps/skychat ${_pkgdir}/${_skyapps}/skychat
 ln -rTsf ${_pkgdir}/${_skyapps}/skychat ${_pkgdir}/usr/bin/apps/skychat
 chmod +x ${_pkgdir}/usr/bin/apps/skychat
 _msg3 'skysocks'
-install -Dm755 ${pkgdir}/test/skysocks ${_pkgdir}/${_skyapps}/skysocks
+install -Dm755 ${pkgdir}/test/apps/skysocks ${_pkgdir}/${_skyapps}/skysocks
 ln -rTsf ${_pkgdir}/${_skyapps}/skysocks ${_pkgdir}/usr/bin/apps/skysocks
 chmod +x ${_pkgdir}/usr/bin/apps/skysocks
 _msg3 'skysocks-client'
-install -Dm755 ${pkgdir}/test/skysocks-client ${_pkgdir}/${_skyapps}/skysocks-client
+install -Dm755 ${pkgdir}/test/apps/skysocks-client ${_pkgdir}/${_skyapps}/skysocks-client
 ln -rTsf ${_pkgdir}/${_skyapps}/skysocks-client ${_pkgdir}/usr/bin/apps/skysocks-client
 chmod +x ${_pkgdir}/usr/bin/apps/skysocks-client
 _msg3 'vpn-client'
-install -Dm755 ${pkgdir}/test/vpn-client ${_pkgdir}/${_skyapps}/vpn-client
+install -Dm755 ${pkgdir}/test/apps/vpn-client ${_pkgdir}/${_skyapps}/vpn-client
 ln -rTsf ${_pkgdir}/${_skyapps}/vpn-client ${_pkgdir}/usr/bin/apps/vpn-client
 chmod +x ${_pkgdir}/usr/bin/apps/vpn-client
 _msg3 'vpn-server'
-_install2 ${pkgdir}/test/vpn-server ${_skyapps}
-install -Dm755 ${pkgdir}/test/vpn-server ${_pkgdir}/${_skyapps}/vpn-server
+install -Dm755 ${pkgdir}/test/apps/vpn-server ${_pkgdir}/${_skyapps}/vpn-server
 ln -rTsf ${_pkgdir}/${_skyapps}/vpn-server ${_pkgdir}/usr/bin/apps/vpn-server
 chmod +x ${_pkgdir}/usr/bin/apps/vpn-server
 
@@ -184,10 +179,10 @@ 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 skywire control file, postinst & postrm scripts'
+_msg2 'installing skywire control file and install scripts'
 install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control
 install -Dm755 ${srcdir}/${_scripts}/postinst.sh ${_pkgdir}/DEBIAN/postinst
-install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm
+#install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm
 
 _msg2 'creating the debian package'
 #create the debian package!