keep pkgrel synced with skywire-bin

4 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7d8d4488849..1754331557d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
 	pkgver = 1.3.6
-	pkgrel = 5
+	pkgrel = 7
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 037df9653f42..fcc9adee0f83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _githuborg=${FORK:-$_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath=github.com/${_githuborg}/${_pkgname}
 pkgver='1.3.6'
-pkgrel=5
+pkgrel='7'
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -111,7 +111,7 @@ _msg2 'creating dirs'
 mkdir -p "${_pkgdir}/usr/bin"
 mkdir -p "${_pkgdir}/${_dir}/bin"
 mkdir -p "${_pkgdir}/${_dir}/apps"
-mkdir -p "${_pkgdir}/${_dir}/local"
+mkdir -p "${_pkgdir}/${_dir}/local/custom"
 mkdir -p "${_pkgdir}/${_dir}/scripts"
 mkdir -p "${_pkgdir}/${_systemddir}"
 _msg2 'installing binaries'
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 539e9c1ed946..102bbd814912 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -1,7 +1,6 @@
 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-cross-bin" "muslcc-arm-linux-musleabihf-cross-bin" "muslcc-arm-linux-musleabi-cross-bin")
 
 prepare() {
diff --git a/updates.sh b/updates.sh
index 6b162e439da4..6aa0a491723b 100755
--- a/updates.sh
+++ b/updates.sh
@@ -16,16 +16,21 @@ _version=${_version//v/}
 #if [[ $_vrc != "" ]]; then
 #	_vrc="-${_vrc##*-}"
 #fi
-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
+source PKGBUILD
+_prel="$(curl -s https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${pkgname} | grep pkgrel | cut -d "=" -f2)"
+if [[ -z _prelnew ]] ; then
+_prelnew=$_prel
+let _prelnew++
+fi
+echo "setting pkgver=$_version, pkgrel=${_prelnew} for PKGBUILD"
+sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD && sed -i "s/^pkgrel=.*/pkgrel='${_prelnew}'/" PKGBUILD
+echo "updating checksums for PKGBUILD(s)"
 updpkgsums
 ls *PKGBUILD | parallel updpkgsums {}
 echo "creating .SRCINFO"
 makepkg --printsrcinfo > .SRCINFO
 #sha256sum skywire-scripts.tar.gz
-echo "don't forget to increment pkgrel if you edited the PKGBUILD"
+echo "old pkgrel=$_prel"
 source PKGBUILD && echo "pkgver=${pkgver}" && echo "pkgrel=${pkgrel}"
 echo
 echo "git add -f" *PKGBUILD " .SRCINFO skywire.install updates.sh test.sh skycoin"