match package function to skywire-bin PKGBUILD ; source skywire-bin AUR for package-level files instead of specifying them individually ; add package tree output at the end of package func ; add option for rebuilding UI

1 files changed, 40 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6f03c34a44a0..1ef185374016 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=3
+pkgrel=5
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -16,24 +16,19 @@ arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'arm
 url="https://${_pkggopath}"
 license=('license-free')
 makedepends=("git" "go" "musl" "kernel-headers-musl")
+[[ ${REBUILDUI} == "1" ]] && makedepends=(${makedepends[@]} "npm")
 install=skywire.install
+_script=("skywire-autoconfig")
+_desktop=("skywire.desktop" "skywirevpn.desktop")
+_icon=("skywirevpn.png" "skywire.png")
+_service=("skywire.service" "skywire-autoconfig.service")
 source=("skywire-${_tag_ver}.tar.gz::${url}/archive/refs/tags/${_tag_ver}.tar.gz"
-"skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin"
-"skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/skywire.desktop?h=skywire-bin"
-"skywirevpn.desktop::https://aur.archlinux.org/cgit/aur.git/plain/skywirevpn.desktop?h=skywire-bin"
-"skywirevpn.png::https://aur.archlinux.org/cgit/aur.git/plain/skywirevpn.png?h=skywire-bin"
-"skywire.png::https://aur.archlinux.org/cgit/aur.git/plain/skywire.png?h=skywire-bin"
-"skywire.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire.service?h=skywire-bin"
-"skywire-autoconfig.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig.service?h=skywire-bin"
+"skywire-bin::git+https://aur.archlinux.org/skywire-bin"
 )
 sha256sums=('56da81239baefeffd0bb607c4d1d3a1efc2e86e029471892970e531a9c269533'
-            '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
-            'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
-            '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
-            'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
-            'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
-            '6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d'
-            '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3')
+            'SKIP')
+_binary=("skywire-cli" "skywire-visor")
+_appbinary=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server")
 
 prepare() {
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
@@ -52,6 +47,11 @@ export GOOS=linux
 export CGO_ENABLED=1  #default anyways
 #use musl-gcc for static compilation
 export CC=musl-gcc
+if [[ ${REBUILDUI} == "1" ]] ;then
+make build-ui
+else
+  _msg2 'Not rebuilding UI. Export REBUILDUI=1 to recompile the UI'
+fi
 _build
 }
 #_build function - used in build variants
@@ -83,68 +83,74 @@ go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external
 #binary transparency
 cd "$GOBIN" || exit
 _msg2 'binary sha256sums'
-sha256sum "$(ls)"
+sha256sum $(ls)
 cd "$_GOAPPS" || exit
-sha256sum "$(ls)"
+sha256sum $(ls)
+
 }
 
 package() {
 #declare the _pkgdir and systemd directory
 _pkgdir="${pkgdir}"
 _systemddir="usr/lib/systemd/system"
+_skywirebin="skywire-bin/"
 _package
 }
 #_package function - used in build variants
 _package() {
 _dir="opt/skywire"
-_apps="${_skydir}/apps"
-_bin="${_skydir}/bin"
-_scriptsdir="${_skydir}/scripts"
+_apps="${_dir}/apps"
+_bin="${_dir}/bin"
+_scriptsdir="${_dir}/scripts"
 _msg2 'creating dirs'
 mkdir -p "${_pkgdir}/usr/bin"
-mkdir -p "${_pkgdir}/${_skydir}/bin"
-mkdir -p "${_pkgdir}/${_skydir}/apps"
-mkdir -p "${_pkgdir}/${_skydir}/local"
-mkdir -p "${_pkgdir}/${_skydir}/scripts"
+mkdir -p "${_pkgdir}/${_dir}/bin"
+mkdir -p "${_pkgdir}/${_dir}/apps"
+mkdir -p "${_pkgdir}/${_dir}/local"
+mkdir -p "${_pkgdir}/${_dir}/scripts"
 mkdir -p "${_pkgdir}/${_systemddir}"
 _msg2 'installing binaries'
 for _i in "${_binary[@]}" ; do
   _msg3 ${_i}
-	install -Dm755 "${GOBIN}/${_i}" "${_pkgdir}/${_skybin}/"
-	ln -rTsf "${_pkgdir}/${_skybin}/${_i}" "${_pkgdir}/usr/bin/${_i}"
+	install -Dm755 "${GOBIN}/${_i}" "${_pkgdir}/${_bin}/"
+	ln -rTsf "${_pkgdir}/${_bin}/${_i}" "${_pkgdir}/usr/bin/${_i}"
 done
 _msg2 'installing app binaries'
 for _i in "${_appbinary[@]}" ; do
   _msg3 ${_i}
-  install -Dm755 "${_GOAPPS}/${_i}" "${_pkgdir}/${_skyapps}/${_i}"
-	ln -rTsf "${_pkgdir}/${_skyapps}/${_i}" "${_pkgdir}/usr/bin/${_i}"
+  install -Dm755 "${_GOAPPS}/${_i}" "${_pkgdir}/${_apps}/${_i}"
+	ln -rTsf "${_pkgdir}/${_apps}/${_i}" "${_pkgdir}/usr/bin/${_i}"
 done
 _msg2 'Installing scripts'
 for _i in "${_script[@]}" ; do
   _msg3 ${_i}
-  install -Dm755 "${srcdir}/${_i}" "${_pkgdir}/${_scriptsdir}/${_i}"
+  install -Dm755 "${srcdir}/${_skywirebin}${_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}/dmsghttp-config.json" "${_pkgdir}/${_skydir}/dmsghttp-config.json"
+install -Dm644 "${srcdir}/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json" || install -Dm644 "${srcdir}/skywire/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json"
 _msg2 'Installing systemd services'
 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}"
+  install -Dm644 "${srcdir}/${_skywirebin}${_i}" "${_pkgdir}/${_systemddir}/${_i}"
+  install -Dm644 "${srcdir}/${_skywirebin}${_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/"
 for _i in "${_desktop[@]}" ; do
   _msg3 ${_i}
-  install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/usr/share/applications/${_i}"
+  install -Dm644 "${srcdir}/${_skywirebin}${_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}"
+  install -Dm644 "${srcdir}/${_skywirebin}${_i}" "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/${_i}"
 done
+if command -v tree &> /dev/null ; then
+_msg2 'package tree'
+  tree -a ${_pkgdir}
+fi
 }
 
 _msg2() {