builds now at version 1.0.0

5 files changed, 53 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2178746a71d..28bf1ea32158 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-bin
 	pkgdesc = Skywire: Building a new Internet. Skycoin.com
 	pkgver = 1.0.0
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -15,24 +15,19 @@ pkgbase = skywire-bin
 	arch = armhf
 	arch = armel
 	arch = arm
-	depends = net-tools
 	provides = skywire
 	conflicts = skywire
 	source = skywire-scripts.tar.gz
-	sha256sums = 7d6bc4a657fddd0c58a710d53728e8546082dc3e2d61d2aea71716bb82b6e440
-	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-amd64.tar.gz
-	sha256sums_x86_64 = 1c9a179095fee2895e12a34efc68c4bc6e5031eb6ee364ff838c0454a07dc427
-	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-arm64.tar.gz
-	sha256sums_aarch64 = 93e82f3a6799e68fcbbb7f613ebf1f417fcb41456e98d68649772c7890c076e0
-	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-arm64.tar.gz
-	sha256sums_armv8 = 93e82f3a6799e68fcbbb7f613ebf1f417fcb41456e98d68649772c7890c076e0
-	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-armhf.tar.gz
-	sha256sums_armv7 = dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078
-	source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-armhf.tar.gz
-	sha256sums_armv7l = dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078
-	source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-armhf.tar.gz
-	sha256sums_armv7h = dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078
-	source_arm = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc7/skywire-v1.0.0-rc7-linux-armhf.tar.gz
-	sha256sums_arm = dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078
+	sha256sums = f45b8eff316a16262f2b0533d244a923a92a88d6f13f9e965b3f9723942d4d3f
+	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-amd64.tar.gz
+	sha256sums_x86_64 = bc019915906df4a2be559b9bfc8b870e1a820071f799cd5608070fe242d29a6a
+	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm64.tar.gz
+	sha256sums_aarch64 = cf76f6a154a07501baa7208d8a99aa0ea28e5c72f8e37c45f76a1253f878faa4
+	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm64.tar.gz
+	sha256sums_armv8 = cf76f6a154a07501baa7208d8a99aa0ea28e5c72f8e37c45f76a1253f878faa4
+	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-armhf.tar.gz
+	sha256sums_armv7 = f76d5e12b34ee67cf758c0df25e619ce28a9ae823497425c2bcca9f34db2c0c6
+	source_arm = https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm.tar.gz
+	sha256sums_arm = a6b97d0e0bc7f37460edcfe043f16cb28ca9dffb0930d305546e7382ba72259b
 
 pkgname = skywire-bin
diff --git a/PKGBUILD b/PKGBUILD
index 63f53df22c2e..53cb12d45b0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@ _pkgname=${pkgname/-bin/}
 _githuborg=skycoin
 pkgdesc="Skywire: Building a new Internet. Skycoin.com"
 pkgver='1.0.0'
-pkgrel=7
-_rc='-rc7'
+pkgrel=8
+_rc=''
 _pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
@@ -14,32 +14,32 @@ arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'arm
 url="https://${_pkggopath}"
 provides=( 'skywire' )
 conflicts=( 'skywire' )
-depends=( 'net-tools' )
+#depends=( '' )
 install=skywire.install
 _scripts=${_pkgname}-scripts
 source=("${_scripts}.tar.gz" )
-sha256sums=('7d6bc4a657fddd0c58a710d53728e8546082dc3e2d61d2aea71716bb82b6e440')
-sha256sums_x86_64=('1c9a179095fee2895e12a34efc68c4bc6e5031eb6ee364ff838c0454a07dc427')
-sha256sums_aarch64=('93e82f3a6799e68fcbbb7f613ebf1f417fcb41456e98d68649772c7890c076e0')
-sha256sums_armv8=('93e82f3a6799e68fcbbb7f613ebf1f417fcb41456e98d68649772c7890c076e0')
-sha256sums_armv7=('dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078')
-sha256sums_armv7l=('dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078')
-sha256sums_armv7h=('dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078')
-sha256sums_arm=('dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078')
-#https://github.com/skycoin/skywire/releases/download/v1.0.0-rc6/skywire-v1.0.0-rc6-linux-amd64.tar.gz
+sha256sums=('f45b8eff316a16262f2b0533d244a923a92a88d6f13f9e965b3f9723942d4d3f')
+sha256sums_x86_64=('bc019915906df4a2be559b9bfc8b870e1a820071f799cd5608070fe242d29a6a')
+sha256sums_aarch64=('cf76f6a154a07501baa7208d8a99aa0ea28e5c72f8e37c45f76a1253f878faa4')
+sha256sums_armv8=('cf76f6a154a07501baa7208d8a99aa0ea28e5c72f8e37c45f76a1253f878faa4')
+sha256sums_armv7=('f76d5e12b34ee67cf758c0df25e619ce28a9ae823497425c2bcca9f34db2c0c6')
+sha256sums_arm=('a6b97d0e0bc7f37460edcfe043f16cb28ca9dffb0930d305546e7382ba72259b')
+#https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-amd64.tar.gz
+#https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm64.tar.gz
+#https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-armhf.tar.gz
+#https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm.tar.gz
 _binarchive=("${_pkgname}-${_tag_ver}-linux")
 _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}")
 source_x86_64=("${_release_url}-amd64.tar.gz")
 source_aarch64=("${_release_url}-arm64.tar.gz")
 source_armv8=( ${source_aarch64[@]} )
-source_arm=("${_release_url}-armhf.tar.gz")
-source_armv7=( ${source_arm[@]} )
-source_armv7l=( ${source_arm[@]} )
-source_armv7h=( ${source_arm[@]} )
+source_arm=("${_release_url}-arm.tar.gz")
+source_armv7=("${_release_url}-armhf.tar.gz")
+source_armv7l=( ${source_armhf[@]} )
+source_armv7h=( ${source_armhf[@]} )
 
 package() {
 _msg2 'Creating dirs'
-#create directory trees or the visor might make them with weird permissions
 _pkgdir="${pkgdir}"
 _skydir="opt/skywire"
 _skyapps="${_skydir}/apps"
@@ -82,7 +82,6 @@ chmod +x ${_pkgdir}/usr/bin/*
 _msg2 'installing dmsghttp-config.json'
 install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
 
-#install systemd services
 _msg2 'Installing systemd services'
 install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/
 
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 76e2f5b0624d..ec1ade3073de 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -5,19 +5,19 @@ _pkgname=${pkgname/-bin/}
 _githuborg=skycoin
 pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package"
 pkgver='1.0.0'
-_rc='-rc7'
+_rc=''
 _pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
-pkgrel=7
+pkgrel=8
 _pkgrel=${pkgrel}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 _pkgarch=$(dpkg --print-architecture)
-_pkgarches=('armhf' 'arm64' 'amd64')
+_pkgarches=('amd64' 'arm64' 'armhf' 'armel')
 arch=('any')
 url="https://${_pkggopath}"
-makedepends=('dpkg') # 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring')
+makedepends=('dpkg')
 depends=()
-_debdeps="net-tools"
+_debdeps=""
 #_debdeps=""
 _scripts="skywire-scripts"
 _binarchive=("${_pkgname}-${_tag_ver}-linux")
@@ -27,16 +27,19 @@ source=(
 "${_release_url}-amd64.tar.gz"
 "${_release_url}-arm64.tar.gz"
 "${_release_url}-armhf.tar.gz"
+"${_release_url}-arm.tar.gz"
 )
 noextract=(
 "${_binarchive}-amd64.tar.gz"
 "${_binarchive}-arm64.tar.gz"
 "${_binarchive}armhf.tar.gz"
+"${_release_url}-arm.tar.gz"
 )
-sha256sums=('7d6bc4a657fddd0c58a710d53728e8546082dc3e2d61d2aea71716bb82b6e440'
-            '1c9a179095fee2895e12a34efc68c4bc6e5031eb6ee364ff838c0454a07dc427'
-            '93e82f3a6799e68fcbbb7f613ebf1f417fcb41456e98d68649772c7890c076e0'
-            'dc91bb6116fbd99e2260af1479e58296a53707a8e4132a247be7fd66d4407078')
+sha256sums=('f45b8eff316a16262f2b0533d244a923a92a88d6f13f9e965b3f9723942d4d3f'
+            'bc019915906df4a2be559b9bfc8b870e1a820071f799cd5608070fe242d29a6a'
+            'cf76f6a154a07501baa7208d8a99aa0ea28e5c72f8e37c45f76a1253f878faa4'
+            'f76d5e12b34ee67cf758c0df25e619ce28a9ae823497425c2bcca9f34db2c0c6'
+            'a6b97d0e0bc7f37460edcfe043f16cb28ca9dffb0930d305546e7382ba72259b')
 
 build() {
   _msg2 'creating the DEBIAN/control files'
@@ -53,7 +56,6 @@ build() {
     echo "Provides: ${_pkgname}" >> ${srcdir}/${_pkgarch}.control
     echo "Maintainer: ${_githuborg}" >> ${srcdir}/${_pkgarch}.control
     echo "Description: ${pkgdesc}" >> ${srcdir}/${_pkgarch}.control
-
   done
 }
 
@@ -63,8 +65,8 @@ for i in ${_pkgarches[@]}; do
 _msg2 "_pkgarch=${i}"
 local _pkgarch=${i}
 local _pkgarch1=${_pkgarch}
-if [[ ${_pkgarch} == "armhf" ]] ; then
-  local _pkgarch1=armhf
+if [[ ${_pkgarch} == "armel" ]] ; then
+  local _pkgarch1=arm
 fi
 
 local _binaryarchive="${_pkgname}-${_tag_ver}-linux-${_pkgarch1}.tar.gz"
@@ -79,6 +81,7 @@ _msg2 'creating dirs'
 #set up to create a .deb package
 _debpkgdir="${pkgname}-${pkgver}-${pkgrel}-${_pkgarch}"
 _pkgdir="${pkgdir}/${_debpkgdir}"
+
 _skydir="opt/skywire"
 _skyapps="${_skydir}/apps"
 _skyscripts="${_skydir}/scripts"
@@ -119,7 +122,7 @@ ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
 #make sure everything is executable
 chmod +x ${_pkgdir}/usr/bin/*
 
-#install dmsghttp-config.json
+_msg2 'installing dmsghttp-config.json'
 install -Dm644 ${pkgdir}/test/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
 
 _msg2 'installing systemd services'
@@ -149,21 +152,8 @@ done
 exit
 }
 
-_install2() {
-_binname="${1##*/}"
-_binname="${_binname%%.*}"
-install -Dm755 ${1} ${_pkgdir}/${2}/${_binname}
-ln -rTsf ${_pkgdir}/${2}/${_binname} ${_pkgdir}/usr/bin/${_binname}
-}
-
 _msg2() {
 	(( QUIET )) && return
 	local mesg=$1; shift
 	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
 }
-
-_msg3() {
-(( QUIET )) && return
-local mesg=$1; shift
-printf "${BLUE}  -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
-}
diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz
index 45c2c544f56b..5c91d0549bc0 100644
--- a/skywire-scripts.tar.gz
+++ b/skywire-scripts.tar.gz
diff --git a/updates.sh b/updates.sh
index 6f0b66a9ad53..41b9b2e5f9e6 100755
--- a/updates.sh
+++ b/updates.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
-#re-archive the scripts and update the checksums, etc.
+#re-archive the scripts and update the checksums, etc. Assumes archive was extracted and edited
 tar -czvf skywire-scripts.tar.gz skywire-scripts
 #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
+#Uncomment to use release candidates during pre-release testing
+#_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}
 echo "updating checksums and version for PKGBUILD"
@@ -24,6 +25,8 @@ echo "updating checksums and version for git.PKGBUILD"
 [[ -f git.PKGBUILD ]] && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" git.PKGBUILD && updpkgsums git.PKGBUILD && _gitPKGBUILD="git.PKGBUILD"
 echo "creating .SRCINFO"
 makepkg --printsrcinfo > .SRCINFO
+sha256sum skywire-scripts.tar.gz
 echo "don't forget to increment pkgrel if you edited the PKGBUILD"
+echo
 echo "git add -f ${_debPKGBUILD} ${_ccdebPKGBUILD} ${_devPKGBUILD} ${_gitPKGBUILD} PKGBUILD .SRCINFO skywire-scripts.tar.gz updates.sh test.sh"
 echo 'git commit -m " "'