fix checksum issues and other errors with new PKGBUILD format

8 files changed, 50 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b5e8a0a2497..dfd9b2f8acd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
 	pkgver = 1.2.1
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index aca2acc39285..a8a29ceba92a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _githuborg=${FORK:-$_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath=github.com/${_githuborg}/${_pkgname}
 pkgver='1.2.1'
-pkgrel=7
+pkgrel=8
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -96,6 +96,10 @@ _pkgdir="${pkgdir}"
 _systemddir="usr/lib/systemd/system"
 _skywirebin="skywire-bin/"
 _package
+if command -v tree &> /dev/null ; then
+_msg2 'package tree'
+  tree -a ${pkgdir}
+fi
 }
 #_package function - used in build variants
 _package() {
@@ -148,10 +152,7 @@ for _i in "${_icon[@]}" ; do
   _msg3 ${_i}
   install -Dm644 "${srcdir}/${_skywirebin}${_i}" "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/${_i}"
 done
-if command -v tree &> /dev/null ; then
-_msg2 'package tree'
-  tree -a ${_pkgdir}
-fi
+
 }
 
 _msg2() {
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index e6fdaf3bfc82..ecd39a4f982d 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -1,6 +1,7 @@
 source deb.PKGBUILD
 pkgdesc="Skywire Mainnet Node implementation. Debian package; cross-compile."
 _pkgarches=('armhf' 'arm64' 'amd64')
+##STATIC CROSS-COMPILATION DEPENDENCIES NOT SATISFIABLE!!!
 makedepends=("${makedepends[@]}" "aarch64-linux-musl" "arm-linux-gnueabihf-musl") # 'arm-linux-gnueabihf-binutils' 'aarch64-binutils')
 
 prepare() {
@@ -45,9 +46,17 @@ _GOAPPS=${GOPATH}/apps.${_pkgarch}
 _debpkgdir="${_pkgname}-${pkgver}${_rc}-${_pkgrel}-${_pkgarch}"
 _pkgdir="${pkgdir}/${_debpkgdir}"
 _systemddir="etc/systemd/system"
+_skywirebin="skywire-bin/"
+
 [[ -d ${_pkgdir} ]] && rm -rf ${_pkgdir}
 _packagedeb
 done
+if command -v tree &> /dev/null ; then
+_msg2 'package tree'
+  tree -a ${pkgdir}
+fi
 #exit so the arch package doesn't get built
 exit
 }
+sha256sums=('56da81239baefeffd0bb607c4d1d3a1efc2e86e029471892970e531a9c269533'
+            'SKIP')
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index 4fb5e49776c4..324911dbca45 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -6,28 +6,19 @@ arch=('any')
 _pkgrel=${pkgrel}
 makedepends=("${makedepends[@]}" "dpkg")
 _debdeps=""
-source=("${_sourcedeb[@]}")
-_sourcedeb=( "${source[@]}"
-"postinst.sh::https://aur.archlinux.org/cgit/aur.git/plain/postinst.sh?h=skywire-bin"
-"prerm.sh::https://aur.archlinux.org/cgit/aur.git/plain/prerm.sh?h=skywire-bin"
-)
-sha256sums=('56da81239baefeffd0bb607c4d1d3a1efc2e86e029471892970e531a9c269533'
-            '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
-            'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
-            '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
-            'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
-            'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
-            '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
-            '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c'
-            '7b17a55e64d1371fecd24edc3da7c6a762cf2b3d058f6fc4a5dc7c5f9b4cff09'
-            '233ccf0e87b37e782828f53960e05e478cf381f61bbfdb16a0cc0254ee8be7c2')
 
 package() {
 #set up to create a .deb package
 _debpkgdir="${_pkgname}-${pkgver}${_rc}-${_pkgrel}-${_pkgarch}"
 _pkgdir="${pkgdir}/${_debpkgdir}"
 _systemddir="etc/systemd/system"
+_skywirebin="skywire-bin/"
+
 _packagedeb
+if command -v tree &> /dev/null ; then
+_msg2 'package tree'
+  tree -a ${pkgdir}
+fi
 #exit so the arch package doesn't get built
 exit
 }
@@ -37,8 +28,8 @@ _packagedeb() {
 _package
 _msg2 'installing control file and install scripts'
 #install -Dm755 ${srcdir}/${_scripts}/preinst.sh ${_pkgdir}/DEBIAN/preinst
-install -Dm755 ${srcdir}/postinst.sh ${_pkgdir}/DEBIAN/postinst
-install -Dm755 ${srcdir}/prerm.sh ${_pkgdir}/DEBIAN/prerm
+install -Dm755 ${srcdir}/${_skywirebin}postinst.sh ${_pkgdir}/DEBIAN/postinst
+install -Dm755 ${srcdir}/${_skywirebin}prerm.sh ${_pkgdir}/DEBIAN/prerm
 #install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm
 ### CONTROL FILES CREATION ###
 #create control file for the debian package
@@ -49,11 +40,14 @@ Section: web
 Architecture: ${_pkgarch}
 Depends: ${_debdeps}
 Maintainer: skycoin
-Description: ${pkgdesc}" | tee ${_pkgdir}/DEBIAN/control
-install -dm755 ${_pkgdir}/DEBIAN/control
+Description: ${pkgdesc}" | tee ${pkgdir}/control
+install -Dm755 ${pkgdir}/control ${_pkgdir}/DEBIAN/control
+rm ${pkgdir}/control
 _msg2 'creating the debian package'
 #create the debian package
 cd $pkgdir
 dpkg-deb --build -z9 ${_debpkgdir}
 mv *.deb ../../
 }
+sha256sums=('56da81239baefeffd0bb607c4d1d3a1efc2e86e029471892970e531a9c269533'
+            'SKIP')
diff --git a/dev.PKGBUILD b/dev.PKGBUILD
index 992405f11b6a..9774be24bb7e 100644
--- a/dev.PKGBUILD
+++ b/dev.PKGBUILD
@@ -2,7 +2,20 @@ source deb.PKGBUILD
 source git.PKGBUILD
 pkgdesc="Skywire Mainnet Node implementation; develop branch - Debian package."
 makedepends=("${makedepends[@]}" "dpkg")
-source=( "${_sourcedeb[@]}")
 package() {
-	_packagedeb
+#set up to create a .deb package
+_debpkgdir="${_pkgname}-${pkgver}${_rc}-${_pkgrel}-${_pkgarch}"
+_pkgdir="${pkgdir}/${_debpkgdir}"
+_systemddir="etc/systemd/system"
+_skywirebin="skywire-bin/"
+
+_packagedeb
+if command -v tree &> /dev/null ; then
+_msg2 'package tree'
+  tree -a ${pkgdir}
+fi
+#exit so the arch package doesn't get built
+exit
 }
+sha256sums=('SKIP'
+            'SKIP')
diff --git a/git.PKGBUILD b/git.PKGBUILD
index 195884c226d4..3a985c526aff 100644
--- a/git.PKGBUILD
+++ b/git.PKGBUILD
@@ -1,20 +1,14 @@
 source PKGBUILD
 
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com - develop branch"
-pkgver='autogenerated'
+pkgver=1.2.1
 #build a branch with BRANCH=branch
 #build a fork with FORK=<github-username>
 source=("git+${url}.git#branch=${BRANCH:-develop}"
 "${_source[@]}"
 )
 sha256sums=('SKIP'
-            '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
-            'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
-            '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
-            'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
-            'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
-            '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
-            '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c')
+            'SKIP')
 
 pkgver() {
 _version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1)
@@ -42,5 +36,7 @@ export GOOS=linux
 export CGO_ENABLED=1  #default anyways
 #use musl-gcc for static compilation
 export CC=musl-gcc
+rm -rf ${srcdir}/${pkgname}-${pkgver}${_rc}
+ln -fs ${srcdir}/${pkgname} ${srcdir}/${pkgname}-${pkgver}${_rc}
 _build
 }
diff --git a/systray-git.PKGBUILD b/systray-git.PKGBUILD
index 1db1bfd8b902..31631b44b8e9 100644
--- a/systray-git.PKGBUILD
+++ b/systray-git.PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=${pkgname/-systray/}
 _githuborg=${_projectname}
 pkgdesc="Skywire systray. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
-pkgver='autogenerated'
+pkgver=1.2.1
 pkgrel=1
 #pkgrel=1
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
diff --git a/updates.sh b/updates.sh
index 8fba16fb73b3..de47aaed257a 100755
--- a/updates.sh
+++ b/updates.sh
@@ -18,8 +18,8 @@ echo ${_version}
 echo ${_vrc}
 echo "updating checksums and version for PKGBUILDs"
 sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD
-#ls *PKGBUILD | parallel updpkgsums {}
 updpkgsums
+ls *PKGBUILD | parallel updpkgsums {}
 echo "creating .SRCINFO"
 makepkg --printsrcinfo > .SRCINFO
 #sha256sum skywire-scripts.tar.gz