update to rc6 ; updates.sh updates build version to latest git tag

4 files changed, 51 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc4e29fd1132..34df7ad6519b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-bin
 	pkgdesc = Skywire: Decentralize the web. Skycoin.com
 	pkgver = 1.0.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -15,23 +15,24 @@ pkgbase = skywire-bin
 	arch = armhf
 	arch = armel
 	arch = arm
+	makedepends = git
 	provides = skywire
 	conflicts = skywire
 	source = skywire-scripts.tar.gz
 	sha256sums = 214f2335a95880d1a82513b3db2df665391bea3dd34933c78e60be6f9e2576ea
-	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-amd64.tar.gz
-	sha256sums_x86_64 = 1eae647fd57ba7859c9cb61d9ab82e6a803cf76b24def008f26cb1d3a7660ba3
-	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-arm64.tar.gz
-	sha256sums_aarch64 = d8bfdadb86bbcdbd1fbf39b41a3d56d039974b6cc0f2e139525373b2f13ea5ce
-	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-arm64.tar.gz
-	sha256sums_armv8 = d8bfdadb86bbcdbd1fbf39b41a3d56d039974b6cc0f2e139525373b2f13ea5ce
-	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-armhf.tar.gz
-	sha256sums_armv7 = 56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223
-	source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-armhf.tar.gz
-	sha256sums_armv7l = 56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223
-	source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-armhf.tar.gz
-	sha256sums_armv7h = 56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223
-	source_arm = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc5/skywire-v1.0.0-rc5-linux-armhf.tar.gz
-	sha256sums_arm = 56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223
+	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-amd64.tar.gz
+	sha256sums_x86_64 = cd9bd3794b19a8af4ba93ba57f35c3e291689f924d39cf40067e652f8e5d0d03
+	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-arm64.tar.gz
+	sha256sums_aarch64 = 035294fa4df15c846ec374145a04997928d837d37bdee23cf771dca04258b4e7
+	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-arm64.tar.gz
+	sha256sums_armv8 = 035294fa4df15c846ec374145a04997928d837d37bdee23cf771dca04258b4e7
+	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-armhf.tar.gz
+	sha256sums_armv7 = b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661
+	source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-armhf.tar.gz
+	sha256sums_armv7l = b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661
+	source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-armhf.tar.gz
+	sha256sums_armv7h = b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661
+	source_arm = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-armhf.tar.gz
+	sha256sums_arm = b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661
 
 pkgname = skywire-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1396364344b9..077b212c42ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@ _pkgname=${pkgname/-bin/}
 _githuborg=skycoin
 pkgdesc="Skywire: Decentralize the web. Skycoin.com"
 pkgver='1.0.0'
-pkgrel=5
-_rc='-rc5'
+pkgrel=6
+_rc='-rc6'
 _pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
 url="https://${_pkggopath}"
-makedepends=()
+makedepends=('git')	#git is used for fetching the latest version automatically
 depends=()
 provides=( 'skywire' )
 conflicts=( 'skywire' )
@@ -20,14 +20,14 @@ install=skywire.install
 _scripts=${_pkgname}-scripts
 source=("${_scripts}.tar.gz" )
 sha256sums=('214f2335a95880d1a82513b3db2df665391bea3dd34933c78e60be6f9e2576ea')
-sha256sums_x86_64=('1eae647fd57ba7859c9cb61d9ab82e6a803cf76b24def008f26cb1d3a7660ba3')
-sha256sums_aarch64=('d8bfdadb86bbcdbd1fbf39b41a3d56d039974b6cc0f2e139525373b2f13ea5ce')
-sha256sums_armv8=('d8bfdadb86bbcdbd1fbf39b41a3d56d039974b6cc0f2e139525373b2f13ea5ce')
-sha256sums_armv7=('56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223')
-sha256sums_armv7l=('56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223')
-sha256sums_armv7h=('56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223')
-sha256sums_arm=('56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223')
-#https://github.com/skycoin/skywire/releases/download/v0.6.0-rc1/skywire-v0.6.0-rc1-linux-amd64.tar.gz
+sha256sums_x86_64=('cd9bd3794b19a8af4ba93ba57f35c3e291689f924d39cf40067e652f8e5d0d03')
+sha256sums_aarch64=('035294fa4df15c846ec374145a04997928d837d37bdee23cf771dca04258b4e7')
+sha256sums_armv8=('035294fa4df15c846ec374145a04997928d837d37bdee23cf771dca04258b4e7')
+sha256sums_armv7=('b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661')
+sha256sums_armv7l=('b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661')
+sha256sums_armv7h=('b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661')
+sha256sums_arm=('b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661')
+#https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-amd64.tar.gz
 _binarchive=("${_pkgname}-${_tag_ver}-linux")
 _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}")
 source_x86_64=("${_release_url}-amd64.tar.gz")
@@ -38,7 +38,7 @@ source_armv7=( ${source_arm[@]} )
 source_armv7l=( ${source_arm[@]} )
 source_armv7h=( ${source_arm[@]} )
 
-## compress scripts archive & update checksums - now in updates.sh
+## compress scripts archive, update checksums - now in updates.sh
 #  tar -czvf skywire-scripts.tar.gz skywire-scripts && updpkgsums
 
 package() {
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index eacf71916cac..656b4415f43d 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -5,10 +5,10 @@ _pkgname=${pkgname/-bin/}
 _githuborg=skycoin
 pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package"
 pkgver='1.0.0'
-_rc='-rc5'
+_rc='-rc6'
 _pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
-pkgrel=5
+pkgrel=6
 _pkgrel=${pkgrel}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 _pkgarch=$(dpkg --print-architecture)
@@ -34,9 +34,9 @@ noextract=(
 "${_binarchive}armhf.tar.gz"
 )
 sha256sums=('214f2335a95880d1a82513b3db2df665391bea3dd34933c78e60be6f9e2576ea'
-            '1eae647fd57ba7859c9cb61d9ab82e6a803cf76b24def008f26cb1d3a7660ba3'
-            'd8bfdadb86bbcdbd1fbf39b41a3d56d039974b6cc0f2e139525373b2f13ea5ce'
-            '56e4e02278cc35cc4779c902b2625e8e51e0964a8160cd48652f74a5cdd76223')
+            'cd9bd3794b19a8af4ba93ba57f35c3e291689f924d39cf40067e652f8e5d0d03'
+            '035294fa4df15c846ec374145a04997928d837d37bdee23cf771dca04258b4e7'
+            'b43bf38c31c20f70031de6b4f2f764343d5535972a766b857f3e9a3a9fc19661')
 
 build() {
   _msg2 'creating the DEBIAN/control files'
diff --git a/updates.sh b/updates.sh
index a87f7169a716..e1b3b2efd4d7 100755
--- a/updates.sh
+++ b/updates.sh
@@ -1,9 +1,24 @@
 #!/bin/bash
 #re-archive the scripts and update the checksums, etc.
-tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts
+#tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts
 tar -czvf skywire-scripts.tar.gz skywire-scripts
-updpkgsums cc.deb.PKGBUILD
+#reset the pkgver to autogenerated
+_version=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1)
+_version=${_version##*/}
+_version=${_version%%-*}
+_version=${_version//v/}
+_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -rc)
+if [[ _vrc != "" ]]; then
+	_vrc="-${_vrc##*-}"
+fi
+echo ${_version}
+echo ${_vrc}
+sed -i "s/\npkgver=.*/\npkgver='${_version}'/" PKGBUILD
+sed -i "s/\n_rc=.*/\n_rc='${_vrc}'/" PKGBUILD
+sed -i "s/\npkgver=.*/\npkgver='${_version}'/" cc.deb.PKGBUILD
+sed -i "s/\n_rc=.*/\n_rc='${_vrc}'/" cc.deb.PKGBUILD
 updpkgsums
+updpkgsums cc.deb.PKGBUILD
 makepkg --printsrcinfo > .SRCINFO
 echo "don't forget to increment pkgrel if you edited the PKGBUILD"
-echo "git add -f cc.deb.PKGBUILD PKGBUILD .SRCINFO skywire-scripts.tar.gz skywire-deb-scripts.tar.gz"
+echo "git add -f cc.deb.PKGBUILD PKGBUILD .SRCINFO skywire-scripts.tar.gz" # skywire-deb-scripts.tar.gz"