update to v1.3.18 - new merged binary format.

6 files changed, 31 insertions, 179 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2370cdc97b79..5b4ae0f51600 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
-	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
-	pkgver = 1.3.17
-	pkgrel = 2
+	pkgdesc = Skywire node implementation + deployment services, service discovery, & dmsg utilities. Skycoin.com
+	pkgver = 1.3.18
+	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -21,9 +21,9 @@ pkgbase = skywire
 	makedepends = go
 	makedepends = musl
 	makedepends = kernel-headers-musl
-	source = skywire-v1.3.17.tar.gz::https://github.com/skycoin/skywire/archive/refs/tags/v1.3.17.tar.gz
+	source = skywire-v1.3.18.tar.gz::https://github.com/skycoin/skywire/archive/refs/tags/v1.3.18.tar.gz
 	source = skywire-bin::git+https://aur.archlinux.org/skywire-bin
-	sha256sums = e2da80b94b343fd8b10c948dd69c13957f2f406b1af4673a732da7693060e8ae
+	sha256sums = ebfec5cc8c082307e24d502b0f305cda1201e6372af300fc6517598caf15a176
 	sha256sums = SKIP
 
 pkgname = skywire
diff --git a/PKGBUILD b/PKGBUILD
index cb569ad082c6..4b17c2f76296 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@ _projectname=skycoin
 pkgname=skywire
 _pkgname=${pkgname}
 _githuborg=${FORK:-$_projectname}
-pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
+pkgdesc="Skywire node implementation + deployment services, service discovery, & dmsg utilities. Skycoin.com"
 _pkggopath=github.com/${_githuborg}/${_pkgname}
-pkgver='1.3.17'
-pkgrel='2'
+pkgver='1.3.18'
+pkgrel='1'
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -26,12 +26,12 @@ source=("skywire-${_tag_ver}.tar.gz::${url}/archive/refs/tags/${_tag_ver}.tar.gz
 "${_source[@]}")
 #"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json"
 #"all_servers.json"::"https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers")
-sha256sums=('e2da80b94b343fd8b10c948dd69c13957f2f406b1af4673a732da7693060e8ae'
+sha256sums=('ebfec5cc8c082307e24d502b0f305cda1201e6372af300fc6517598caf15a176'
             'SKIP')
 #            'SKIP'
 #            'SKIP')
-_binary=("skywire-cli" "skywire-visor")
-_appbinary=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server")
+_binaryscript=("skywire-cli" "skywire-visor")
+_appscript=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server")
 
 prepare() {
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
@@ -70,17 +70,19 @@ BUILDINFO="${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT}"
 cd "${srcdir}"/go/src/${_pkggopath} || exit
 _cmddir="${srcdir}"/go/src/${_pkggopath}/cmd
 #static compilation with 'musl' avoids glibc runtime deps which cause binary to fail if correct glibc / libc6 is not found on the system
-_msg2 "building app binaries"
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS "${_cmddir}"/apps/...
-_msg2 "building skywire binaries"
-cd "${_cmddir}"/skywire-visor || exit
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN "${_cmddir}"/skywire-visor/... "${_cmddir}"/skywire-cli/...
+_msg2 "building skywire binary"
+go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN/skywire "${_cmddir}"/skywire-deployment/...
+_msg2 'creating launcher scripts'
+for _i in "${_appscript[@]}" ; do
+  _msg3 ${_i}
+  echo -e '#!/bin/bash\n/opt/skywire/bin/skywire app '"${_i} "'$@' > "${_GOAPPS}/${_i}"
+done
+echo -e '#!/bin/bash\n/opt/skywire/bin/skywire cli $@' > "${GOBIN}/skywire-cli"
+echo -e '#!/bin/bash\n/opt/skywire/bin/skywire visor $@' > "${GOBIN}/skywire-visor"
 #binary transparency
 cd "$GOBIN" || exit
 _msg2 'binary sha256sums'
-sha256sum $(ls)
-cd "$_GOAPPS" || exit
-sha256sum $(ls)
+sha256sum skywire
 
 #the dmsghttp-config.json must match the current dmsg servers on the production deployment
 #https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers
@@ -116,26 +118,23 @@ mkdir -p "${_pkgdir}/${_dir}/apps"
 mkdir -p "${_pkgdir}/${_dir}/local/custom"
 mkdir -p "${_pkgdir}/${_dir}/scripts"
 mkdir -p "${_pkgdir}/${_systemddir}"
-_msg2 'installing binaries'
-for _i in "${_binary[@]}" ; do
-  _msg3 ${_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
+_msg2 'installing scripts and binaries'
+install -Dm755 "${GOBIN}/skywire" "${_pkgdir}/${_bin}/"
+ln -rTsf "${_pkgdir}/${_bin}/skywire" "${_pkgdir}/usr/bin/skywire"
+install -Dm755 "${GOBIN}/skywire-cli" "${_pkgdir}/${_bin}/"
+ln -rTsf "${_pkgdir}/${_bin}/skywire-cli" "${_pkgdir}/usr/bin/skywire-cli"
+install -Dm755 "${GOBIN}/skywire-visor" "${_pkgdir}/${_bin}/"
+ln -rTsf "${_pkgdir}/${_bin}/skywire-visor" "${_pkgdir}/usr/bin/skywire-visor"
+for _i in "${_appscript[@]}" ; do
   _msg3 ${_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}/${_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}/${_dir}/dmsghttp-config.json" || install -Dm644 "${srcdir}/skywire/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json" || install -Dm644 "${srcdir}/skywire-${_pkgver}/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json"
 #make sure the dmsghttp-config will get redownloaded on subsequent builds
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index ac892dcff953..bd2ef564fe79 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -61,5 +61,5 @@ fi
 #exit so the arch package doesn't get built
 exit
 }
-sha256sums=('e2da80b94b343fd8b10c948dd69c13957f2f406b1af4673a732da7693060e8ae'
+sha256sums=('ebfec5cc8c082307e24d502b0f305cda1201e6372af300fc6517598caf15a176'
             'SKIP')
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index 930ac2530abe..7aeefe05e13c 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -49,5 +49,5 @@ cd $pkgdir
 dpkg-deb --build -z9 ${_debpkgdir}
 mv *.deb ../../
 }
-sha256sums=('e2da80b94b343fd8b10c948dd69c13957f2f406b1af4673a732da7693060e8ae'
+sha256sums=('ebfec5cc8c082307e24d502b0f305cda1201e6372af300fc6517598caf15a176'
             'SKIP')
diff --git a/services.PKGBUILD b/services.PKGBUILD
deleted file mode 100644
index 2f441935a93c..000000000000
--- a/services.PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-_projectname=skycoin
-pkgname=skywire-services
-_pkgname=${pkgname}
-_githuborg="SkycoinPro"
-pkgdesc="Skywire production deployment services. Skycoin.com"
-_pkggopath="github.com/${_githuborg}/${_pkgname}"
-pkgver='autogenerated'
-pkgrel=1
-#pkgrel=1
-arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
-url="ssh://${_pkggopath}"
-license=('license-free')
-makedepends=('git' 'go' 'musl' 'kernel-headers-musl')
-depends=('redis')
-source=("git+${url}.git#branch=develop")
-sha256sums=('SKIP')
-
-pkgver() {
-_version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1)
-_version=${_version##*/}
-_version=${_version%%-*}
-_version=${_version//v/}
-echo ${_version}
-}
-
-prepare() {
-# https://wiki.archlinux.org/index.php/Go_package_guidelines
-mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
-ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
-cd ${srcdir}/go/src/${_pkggopath}/
-}
-
-build() {
-export GOPATH=${srcdir}/go
-export GOBIN=${GOPATH}/bin
-export _GOAPPS=${GOPATH}/apps
-export GOOS=linux
-export CGO_ENABLED=1  #default anyways
-#use musl-gcc for static compilation
-export CC=musl-gcc
-
-#local _version="${pkgver}"
-#DMSG_BASE="github.com/skycoin/dmsg"
-#BUILDINFO_PATH="${DMSG_BASE}/buildinfo"
-#BUILDINFO_VERSION="${BUILDINFO_PATH}.version=${_version}"
-#BUILDINFO=${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT}
-
-#create the skywire binaries
-cd ${srcdir}/go/src/${_pkggopath}
-_cmddir=${srcdir}/go/src/${_pkggopath}/cmd
-cd ${_cmddir}
-for i in * ; do
-_msg2 "building ${i} binary"
-cd ${_cmddir}/${i}
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN .
-done
-#binary transparency
-cd $GOBIN
-_msg2 'binary sha256sums'
-sha256sum $(ls)
-}
-
-package() {
-_pkgdir=${pkgdir}
-#create directory trees or the visor might make them with weird permissions
-#only path differing between debian & archlinux
-#_systemddir="usr/lib/systemd/system"
-_skydir="opt/${_pkgname}"
-#_skyapps="${_skydir}/apps"
-#_skyscripts="${_skydir}/scripts"
-_skybin="${_skydir}/bin"
-_msg2 'creating dirs'
-mkdir -p ${_pkgdir}/usr/bin
-mkdir -p ${_pkgdir}/${_skydir}/bin
-#mkdir -p ${_pkgdir}/${_systemddir}
-
-_msg2 'installing binaries'
- install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/
-for _i in ${_pkgdir}/${_skybin}/* ; do
-	ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/}
-done
-
-chmod +x ${_pkgdir}/usr/bin/*
-
-#install systemd services
-#_msg2 'Installing systemd services'
-#install -Dm644 ${srcdir}/*.service ${_pkgdir}/${_systemddir}/
-}
-
-_msg2() {
-(( QUIET )) && return
-local mesg=$1; shift
-printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
-}
diff --git a/skycoin b/skycoin
deleted file mode 100644
index 33ee05a77f20..000000000000
--- a/skycoin
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-KKBBi9xjhxcr/2YJEGqF3IFAYBapxRRNDrSrcVI=
-=hY2M
------END PGP PUBLIC KEY BLOCK-----