bump version v1.3.20

4 files changed, 8 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b78fd8e2651..8945bc0598f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = skywire
 	pkgdesc = Skywire node implementation + deployment services, service discovery, & dmsg utilities. Skycoin.com
-	pkgver = 1.3.19
+	pkgver = 1.3.20
 	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
@@ -21,9 +21,9 @@ pkgbase = skywire
 	makedepends = go
 	makedepends = musl
 	makedepends = kernel-headers-musl
-	source = skywire-v1.3.19.tar.gz::https://github.com/skycoin/skywire/archive/refs/tags/v1.3.19.tar.gz
+	source = skywire-v1.3.20.tar.gz::https://github.com/skycoin/skywire/archive/refs/tags/v1.3.20.tar.gz
 	source = skywire-bin::git+https://aur.archlinux.org/skywire-bin
-	sha256sums = b68d8e54a82215edce8fdaf296be4933754073b7de24fd9701f8cf89497dfb28
+	sha256sums = 5b89560277d6c133fc70680ae0118ba51bd8abb9b94b789f8ae8358ae870fc31
 	sha256sums = SKIP
 
 pkgname = skywire
diff --git a/PKGBUILD b/PKGBUILD
index 3fa607a65715..ce5e0c6660dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=${pkgname}
 _githuborg=${FORK:-$_projectname}
 pkgdesc="Skywire node implementation + deployment services, service discovery, & dmsg utilities. Skycoin.com"
 _pkggopath=github.com/${_githuborg}/${_pkgname}
-pkgver='1.3.19'
+pkgver='1.3.20'
 pkgrel='1'
 _rc=''
 #_rc='-pr1'
@@ -26,11 +26,10 @@ 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=('b68d8e54a82215edce8fdaf296be4933754073b7de24fd9701f8cf89497dfb28'
+sha256sums=('5b89560277d6c133fc70680ae0118ba51bd8abb9b94b789f8ae8358ae870fc31'
             'SKIP')
 
 _binaryscript=("skywire-cli" "skywire-visor")
-_appscript=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server")
 
 prepare() {
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
@@ -44,7 +43,6 @@ cd "${srcdir}/go/src/${_pkggopath}/" || exit
 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
@@ -70,12 +68,8 @@ 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 skywire binary"
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN/skywire "${_cmddir}"/skywire-deployment/...
+go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN/skywire "${_cmddir}"/skywire/...
 _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
@@ -113,7 +107,6 @@ _scriptsdir="${_dir}/scripts"
 _msg2 'creating dirs'
 mkdir -p "${_pkgdir}/usr/bin"
 mkdir -p "${_pkgdir}/${_dir}/bin"
-mkdir -p "${_pkgdir}/${_dir}/apps"
 mkdir -p "${_pkgdir}/${_dir}/local/custom"
 mkdir -p "${_pkgdir}/${_dir}/scripts"
 mkdir -p "${_pkgdir}/${_systemddir}"
@@ -124,11 +117,6 @@ 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
 for _i in "${_script[@]}" ; do
   _msg3 ${_i}
   install -Dm755 "${srcdir}/${_skywirebin}${_i}" "${_pkgdir}/${_scriptsdir}/${_i}"
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 2fa3e6f8fddb..d8e2d9b8d2ee 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=('b68d8e54a82215edce8fdaf296be4933754073b7de24fd9701f8cf89497dfb28'
+sha256sums=('5b89560277d6c133fc70680ae0118ba51bd8abb9b94b789f8ae8358ae870fc31'
             'SKIP')
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index d42d8da5f0c5..54ca533b9a24 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -49,5 +49,5 @@ cd $pkgdir
 dpkg-deb --build -z9 ${_debpkgdir}
 mv *.deb ../../
 }
-sha256sums=('b68d8e54a82215edce8fdaf296be4933754073b7de24fd9701f8cf89497dfb28'
+sha256sums=('5b89560277d6c133fc70680ae0118ba51bd8abb9b94b789f8ae8358ae870fc31'
             'SKIP')