diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 1 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 3 |
4 files changed, 26 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com pkgver = 1.3.13 - pkgrel = 2 + pkgrel = 3 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -26,7 +26,8 @@ pkgbase = skywire-bin source = skywire.png source = skywire.service source = skywire-autoconfig.service - source = dmsghttp-config.json + source = https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json + source = all_servers.json::https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers sha256sums = 9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874 sha256sums = 40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058 sha256sums = 00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae @@ -35,6 +36,7 @@ pkgbase = skywire-bin sha256sums = fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd sha256sums = 8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3 sha256sums = 773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba + sha256sums = 146a614e4aec886536cd01c398ec7cb8b14bd6ccab80c0ef9380712be235924b source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.13/skywire-v1.3.13-linux-amd64.tar.gz sha256sums_x86_64 = 6308d9680242c8ea6a89f677388907b34d2c5806752688b1a1c947e4851f318f source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.3.13/skywire-v1.3.13-linux-arm64.tar.gz @@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" pkgver='1.3.13' -pkgrel='2' +pkgrel='3' _rc='' #_rc='-pr1' _pkgver="${pkgver}${_rc}" @@ -26,9 +26,9 @@ _source=("${_script[@]}" "${_icon[@]}" "${_service[@]}" "${_key[@]}" -"dmsghttp-config.json" +"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json" +"all_servers.json"::"https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers" ) -#"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json" source=("${_source[@]}") sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874' '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058' @@ -37,7 +37,8 @@ sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' 'fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' - '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba') + '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba' + '146a614e4aec886536cd01c398ec7cb8b14bd6ccab80c0ef9380712be235924b') sha256sums_x86_64=('6308d9680242c8ea6a89f677388907b34d2c5806752688b1a1c947e4851f318f') sha256sums_aarch64=('ff8734ea5121beff521acf2bd1340457887085a2504aaf8449f44c3d89910bb0') sha256sums_armv8=('ff8734ea5121beff521acf2bd1340457887085a2504aaf8449f44c3d89910bb0') @@ -61,6 +62,17 @@ source_armv7h=( "${source_armv7[@]}" ) _binary=("skywire-cli" "skywire-visor") _appbinary=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server") +build() { + #the dmsghttp-config.json must match the current dmsg servers on the production deployment + #https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers + #fix the dmsghttp-config.json + if command -v jq &> /dev/null ; then + _msg2 'updating dmsghttp-config.json' + cat dmsghttp-config.json | jq --argjson updated_servers "$(cat all_servers.json | grep -Ev "availableSessions|version|sequence|timestamp|signature" | tr -d '\n' | sed 's/,\s*}/}/g' | jq '.')" '.prod.dmsg_servers = $updated_servers' | tee dmsghttp-config.json + fi + [[ -f "${srcdir}/all_servers.json" ]] && rm "${srcdir}/all_servers.json" +} + package() { GOBIN="${srcdir}/" _GOAPPS="${GOBIN}/apps" @@ -106,6 +118,9 @@ _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" +#make sure the dmsghttp-config will get redownloaded on subsequent builds +[[ -f "${srcdir}/dmsghttp-config.json" ]] && rm "${srcdir}/dmsghttp-config.json" + _msg2 'Installing systemd services' for _i in "${_service[@]}" ; do _msg3 ${_i} diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index ad9d0e03d141..7a1f68a09379 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -31,6 +31,7 @@ sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874' 'fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba' + '146a614e4aec886536cd01c398ec7cb8b14bd6ccab80c0ef9380712be235924b' '6308d9680242c8ea6a89f677388907b34d2c5806752688b1a1c947e4851f318f' 'ff8734ea5121beff521acf2bd1340457887085a2504aaf8449f44c3d89910bb0' '6696c4c5f43ac375a6d9e1c26e644d832d0dfa28ff865c1f2bb15793e96fc562' diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index e0679abfa242..82b6e19f7649 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -21,7 +21,8 @@ sha256sums=('SKIP' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' 'fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' - '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba') + '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba' + '146a614e4aec886536cd01c398ec7cb8b14bd6ccab80c0ef9380712be235924b') pkgver() { _version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) |