update skycoin-bin to 0.27.1

5 files changed, 98 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b732c30404d8..322d85f943ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,27 @@
 pkgbase = skycoin-bin
 	pkgdesc = Skycoin Cryptocurrency Wallet; Binary Release
-	pkgver = 0.27.0
-	pkgrel = 4
-	url = https://github.com/skycoinproject/skycoin
-	arch = any
-	makedepends = skycoin-keyring
+	pkgver = 0.27.1
+	pkgrel = 1
+	url = https://github.com/skycoin/skycoin
+	arch = x86_64
+	arch = aarch64
+	arch = armv7h
+	arch = arm
+	arch = armv6h
+	arch = armhf
+	arch = armel
 	provides = skycoin
+	conflicts = skycoin
 	source = skycoin-scripts.tar.gz
-	source = skycoin-systemd.tar.gz
-	source = PKGBUILD.sig
-	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
-	validpgpkeys = 98F934F04F9334B81DFA3398913BBD5206B19620
-	sha256sums = ca8344614b60e0d9d57b0eba4b44e0febc4addf83a54685539c45e08364b2d23
-	sha256sums = d14d3d597b80a2b79e5edb7e956a7926ca7065230e87fdca026036888835ad42
-	sha256sums = SKIP
+	sha256sums = 0738ce23beafc315cad3971afb9b210b0749df05e064db169aea618b5bbd5555
+	source_x86_64 = https://downloads.skycoin.com/wallet/skycoin-0.27.1-gui-standalone-linux-x64.tar.gz
+	sha256sums_x86_64 = ba4c2354b091b3db0ac7418caab1d52988b6fd1d18a9f0d5e0ebcb3f4ef15f94
+	source_aarch64 = https://downloads.skycoin.com/wallet/skycoin-0.27.1-gui-standalone-linux-arm.tar.gz
+	sha256sums_aarch64 = e4bbbde43a4971d21aefec55d4fbe3173694567bc372718ce4dd7352ca0bc169
+	source_armv7h = https://downloads.skycoin.com/wallet/skycoin-0.27.1-gui-standalone-linux-arm.tar.gz
+	sha256sums_armv7h = e4bbbde43a4971d21aefec55d4fbe3173694567bc372718ce4dd7352ca0bc169
+	sha256sums_armhf = e4bbbde43a4971d21aefec55d4fbe3173694567bc372718ce4dd7352ca0bc169
+	sha256sums_armel = e4bbbde43a4971d21aefec55d4fbe3173694567bc372718ce4dd7352ca0bc169
 
 pkgname = skycoin-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index e5025ba748b3..aae460d04f3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,87 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 #t.me/Skycoin for inquiries
-pkgname=skycoin-bin
-pkgname1=skycoin
-projectname=skycoin
-githuborg=skycoinproject
+_pkgname=skycoin
+pkgname=${_pkgname}-bin
+_projectname=${_pkgname}
+_githuborg=${_projectname}
 pkgdesc="Skycoin Cryptocurrency Wallet; Binary Release"
-pkgoption1="gui-standalone-linux-x64"
-pkgoption2="gui-standalone-linux-arm"
-pkgver='0.27.0'
-pkggopath="github.com/${githuborg}/${pkgname1}"
-pkgrel=4
-arch=('any')
-url="https://${pkggopath}"
-url1="https://downloads.${pkgname1}.com/wallet"
+pkgver='0.27.1'
+_pkggopath="github.com/${_githuborg}/${_pkgname}"
+pkgrel=1
+arch=('x86_64' 'aarch64' 'armv7h' 'arm' 'armv6h' 'armhf' 'armel' )
+url="https://${_pkggopath}"
+_url="https://downloads.${_projectname}.com/wallet"
 license=()
-makedepends=(skycoin-keyring)
-provides=(skycoin)
-source=("${pkgname1}-scripts.tar.gz"
-"${pkgname1}-systemd.tar.gz"
-"PKGBUILD.sig")
-sha256sums=('ca8344614b60e0d9d57b0eba4b44e0febc4addf83a54685539c45e08364b2d23'
-            'd14d3d597b80a2b79e5edb7e956a7926ca7065230e87fdca026036888835ad42'
-            'SKIP')
+makedepends=()
+provides=( 'skycoin' )
+conflicts=( 'skycoin' )
 #bsdtar -czvf skycoin-scripts.tar.gz skycoin-scripts
-#bsdtar -czvf skycoin-systemd.tar.gz skycoin-systemd
-#https://downloads.skycoin.com/wallet/skycoin-0.27.0-gui-standalone-linux-x64.tar.gz
-source_x86_64=("${url1}/${pkgname1}-${pkgver}-gui-standalone-linux-x64.tar.gz"
-"${url1}/${pkgname1}-${pkgver}-gui-standalone-linux-x64.tar.gz.asc")
-sha256sums_x86_64=('75c14e7379536694f1a1a5a8ebf7abea087b5d3898657e86281073f339c43fcf'
-'a975230a14b45352ffd0d53645af460c990fcee3c67ec5db4f291c36547dffd6')
-#https://downloads.skycoin.com/wallet/skycoin-0.27.0-gui-standalone-linux-arm.tar.gz
-source_aarch64=("${url1}/${pkgname1}-${pkgver}-gui-standalone-linux-arm.tar.gz"
-"${url1}/${pkgname1}-${pkgver}-gui-standalone-linux-arm.tar.gz.asc")
-sha256sums_aarch64=('899564f1359b4f7235015dbd3ae59502572515658716a925f59245b815012887'
-'a975230a14b45352ffd0d53645af460c990fcee3c67ec5db4f291c36547dffd6')
-validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
-                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
-prepare() {
-	#verify PKGBUILD signature
-  gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
-  # https://wiki.archlinux.org/index.php/Go_package_guidelines
-}
+source=("${_pkgname}-scripts.tar.gz"
+) #"PKGBUILD.sig")
+sha256sums=('0738ce23beafc315cad3971afb9b210b0749df05e064db169aea618b5bbd5555')
+#https://downloads.skycoin.com/wallet/skycoin-0.27.1-gui-standalone-linux-x64.tar.gz
+#https://downloads.skycoin.com/wallet/skycoin-0.27.1-gui-standalone-linux-arm.tar.gz
+_release_url=("${_url}/${_pkgname}-${pkgver}-gui-standalone-linux")
+source_x86_64=("${_release_url}-x64.tar.gz")
+# "${_release_url}-x64.tar.gz.asc")
+source_aarch64=("${_release_url}-arm.tar.gz")
+# "${_release_url}-arm.tar.gz.asc")
+source_armv7=( ${source_aarch64[@]} )
+source_armv7l=( ${source_aarch64[@]} )
+source_armv7h=( ${source_aarch64[@]} )
+source_armv8=( ${source_aarch64[@]} )
+sha256sums_x86_64=('ba4c2354b091b3db0ac7418caab1d52988b6fd1d18a9f0d5e0ebcb3f4ef15f94')
+# 'ba4c2354b091b3db0ac7418caab1d52988b6fd1d18a9f0d5e0ebcb3f4ef15f94')
+sha256sums_aarch64=('e4bbbde43a4971d21aefec55d4fbe3173694567bc372718ce4dd7352ca0bc169')
+# 'e4bbbde43a4971d21aefec55d4fbe3173694567bc372718ce4dd7352ca0bc169'
+sha256sums_armv8=( ${sha256sums_aarch64[@]} )
+sha256sums_armv7=( ${sha256sums_aarch64[@]} )
+sha256sums_armv7l=( ${sha256sums_aarch64[@]} )
+sha256sums_armv7h=( ${sha256sums_aarch64[@]} )
+sha256sums_armhf=( ${sha256sums_aarch64[@]} )
+sha256sums_armel=( ${sha256sums_aarch64[@]} )
+#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
+#                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
+
+#prepare() {
+#verify PKGBUILD signature
+#gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
+# https://wiki.archlinux.org/index.php/Go_package_guidelines
+#}
 
 package() {
-	#create directory trees
-	mkdir -p ${pkgdir}/usr/bin
-	mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
-	mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
-	#install binary
-	install -Dm755 ${srcdir}/${pkgname1}-${pkgver}-*/${pkgname1} ${pkgdir}/usr/lib/${projectname}/go/bin/
-	ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${pkgname1} ${pkgdir}/usr/bin/${pkgname1}
-	chmod 755 ${pkgdir}/usr/bin/${pkgname1}
-	#install the web dir (UI)
-	cp -r ${srcdir}/${pkgname1}-${pkgver}-*/src ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
-	#install the scripts
-	cd ${srcdir}/${pkgname1}-scripts/
-	skycoinscripts=$( ls )
-	for i in $skycoinscripts; do
-		install -Dm755 ${srcdir}/${pkgname1}-scripts/${i} ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
-		ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${i}
-	done
-	#install the system.d service
-	cd ${srcdir}/${pkgname1}-systemd/
-	skycoinservices=$( ls )
-	for i in $skycoinservices; do
-	install -Dm644 ${srcdir}/${pkgname1}-scripts/${i} ${pkgdir}/usr/lib/systemd/system/${i}
-done
+_msg2 'creating dirs'
+#create directory trees
+mkdir -p ${pkgdir}/usr/bin
+mkdir -p ${pkgdir}/opt/${_pkgname}/bin
+
+_msg2 'installing binaries'
+#install binary
+if [[ $CARCH == 'x86_64' ]] ; then
+install -Dm755 ${_pkgname}-${pkgver}-gui-standalone-linux-x64/${_pkgname} ${pkgdir}/opt/${_pkgname}/bin/${_pkgname}
+else
+install -Dm755 ${_pkgname}-${pkgver}-gui-standalone-linux-arm/${_pkgname} ${pkgdir}/opt/${_pkgname}/bin/${_pkgname}
+fi
+ln -rTsf ${pkgdir}/opt/${_pkgname}/bin/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
+chmod 755 ${pkgdir}/usr/bin/${_pkgname}
+
+_msg2 'installing gui sources'
+#install the web dir (UI)
+cp -r ${srcdir}/${_pkgname}-${pkgver}-*/src ${pkgdir}/opt/${_pkgname}/
+
+_msg2 'installing scripts'
+#install the scripts
+install -Dm755 ${srcdir}/${_pkgname}-scripts/${_pkgname}-wallet ${pkgdir}/usr/bin/${_pkgname}-wallet
+install -Dm755 ${srcdir}/${_pkgname}-scripts/${_pkgname}-wallet-nohup ${pkgdir}/usr/bin/${_pkgname}-wallet-nohup
+
+_msg2 'installing systemd services'
+#install the system.d service
+install -Dm644 ${srcdir}/${_pkgname}-scripts/${_pkgname}-node.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-node.service
+}
+
+_msg2() {
+(( QUIET )) && return
+local mesg=$1; shift
+printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
deleted file mode 100644
index 403c1e4561db..000000000000
--- a/PKGBUILD.sig
+++ /dev/null
diff --git a/skycoin-scripts.tar.gz b/skycoin-scripts.tar.gz
index 50bc1e13d2e1..844394be8cb4 100644
--- a/skycoin-scripts.tar.gz
+++ b/skycoin-scripts.tar.gz
diff --git a/skycoin-systemd.tar.gz b/skycoin-systemd.tar.gz
deleted file mode 100644
index 7b786d4701ec..000000000000
--- a/skycoin-systemd.tar.gz
+++ /dev/null