apply optimizatons from skywire-bin package

2 files changed, 39 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 949a763b84f5..911318474189 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
 	pkgver = 1.2.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -34,7 +34,7 @@ pkgbase = skywire
 	sha256sums = 0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8
 	sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e
 	sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495
-	sha256sums = 19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18
-	sha256sums = 55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c
+	sha256sums = 6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d
+	sha256sums = 8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3
 
 pkgname = skywire
diff --git a/PKGBUILD b/PKGBUILD
index 255ec4b12b06..6f03c34a44a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='1.2.1'
-pkgrel=2
+pkgrel=3
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -32,8 +32,8 @@ sha256sums=('56da81239baefeffd0bb607c4d1d3a1efc2e86e029471892970e531a9c269533'
             '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
             'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
             'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
-            '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
-            '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c')
+            '6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d'
+            '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3')
 
 prepare() {
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
@@ -95,12 +95,11 @@ _systemddir="usr/lib/systemd/system"
 _package
 }
 #_package function - used in build variants
-#_package function - used in build variants
 _package() {
-_skydir="opt/skywire"
-_skyapps="${_skydir}/apps"
-_skybin="${_skydir}/bin"
-_skyscripts="${_skydir}/scripts"
+_dir="opt/skywire"
+_apps="${_skydir}/apps"
+_bin="${_skydir}/bin"
+_scriptsdir="${_skydir}/scripts"
 _msg2 'creating dirs'
 mkdir -p "${_pkgdir}/usr/bin"
 mkdir -p "${_pkgdir}/${_skydir}/bin"
@@ -109,28 +108,43 @@ mkdir -p "${_pkgdir}/${_skydir}/local"
 mkdir -p "${_pkgdir}/${_skydir}/scripts"
 mkdir -p "${_pkgdir}/${_systemddir}"
 _msg2 'installing binaries'
-for _i in "${_binaries[@]}" ; do
+for _i in "${_binary[@]}" ; do
+  _msg3 ${_i}
 	install -Dm755 "${GOBIN}/${_i}" "${_pkgdir}/${_skybin}/"
 	ln -rTsf "${_pkgdir}/${_skybin}/${_i}" "${_pkgdir}/usr/bin/${_i}"
- done
+done
 _msg2 'installing app binaries'
-install -Dm755 "${_GOAPPS}/"* "${_pkgdir}/${_skyapps}/"
-for _i in "${_pkgdir}/${_skyapps}/"* ; do
-	ln -rTsf "${_i}" "${_pkgdir}/usr/bin/${_i##*/}"
+for _i in "${_appbinary[@]}" ; do
+  _msg3 ${_i}
+  install -Dm755 "${_GOAPPS}/${_i}" "${_pkgdir}/${_skyapps}/${_i}"
+	ln -rTsf "${_pkgdir}/${_skyapps}/${_i}" "${_pkgdir}/usr/bin/${_i}"
 done
 _msg2 'Installing scripts'
-install -Dm755 "${srcdir}/skywire-autoconfig" "${_pkgdir}/${_skyscripts}/"
-ln -rTsf "${_pkgdir}/${_skyscripts}/skywire-autoconfig" "${_pkgdir}/usr/bin/skywire-autoconfig"
-_msg2 'Correcting symlink names'
-ln -rTsf "${_pkgdir}/${_skybin}/${_pkgname}-visor" "${_pkgdir}/usr/bin/${_pkgname}"
+for _i in "${_script[@]}" ; do
+  _msg3 ${_i}
+  install -Dm755 "${srcdir}/${_i}" "${_pkgdir}/${_scriptsdir}/${_i}"
+  ln -rTsf "${_pkgdir}/${_scriptsdir}/${_i}" "${_pkgdir}/usr/bin/${_i}"
+done
+_msg2 'Symlink skywire-visor to skywire'
+ln -rTsf "${_pkgdir}/${_bin}/${_pkgname}-visor" "${_pkgdir}/usr/bin/${_pkgname}"
 _msg2 'installing dmsghttp-config.json'
-install -Dm644 "${srcdir}/${_pkgname}/dmsghttp-config.json" "${_pkgdir}/${_skydir}/dmsghttp-config.json"
+install -Dm644 "${srcdir}/dmsghttp-config.json" "${_pkgdir}/${_skydir}/dmsghttp-config.json"
 _msg2 'Installing systemd services'
-install -Dm644 "${srcdir}/"*.service "${_pkgdir}/${_systemddir}/"
+for _i in "${_service[@]}" ; do
+  _msg3 ${_i}
+  install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/${_systemddir}/${_i}"
+  install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/etc/skel/.config/systemd/user/${_i}"
+done
 _msg2 'installing desktop files and icons'
 mkdir -p "${_pkgdir}/usr/share/applications/" "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/"
-install -Dm644 "${srcdir}/"*.desktop "${_pkgdir}/usr/share/applications/"
-install -Dm644 "${srcdir}/"*.png "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/"
+for _i in "${_desktop[@]}" ; do
+  _msg3 ${_i}
+  install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/usr/share/applications/${_i}"
+done
+for _i in "${_icon[@]}" ; do
+  _msg3 ${_i}
+  install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/${_i}"
+done
 }
 
 _msg2() {
@@ -142,5 +156,5 @@ 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" "$@"
+printf "${BLUE}  -->${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@"
 }