diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 2 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 4 |
4 files changed, 17 insertions, 25 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com pkgver = 1.3.14 - pkgrel = 1 + pkgrel = 2 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -27,8 +27,6 @@ pkgbase = skywire-bin source = skywire.png source = skywire.service source = skywire-autoconfig.service - 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 @@ -36,8 +34,6 @@ pkgbase = skywire-bin sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495 sha256sums = fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd sha256sums = 8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3 - sha256sums = SKIP - sha256sums = SKIP source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.14/skywire-v1.3.14-linux-amd64.tar.gz sha256sums_x86_64 = 52d5d9edeb9b694b213e9b5b210f5dc8c3180331d724b156d69772eb7e9f8a7b source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.3.14/skywire-v1.3.14-linux-arm64.tar.gz @@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" pkgver='1.3.14' -pkgrel='1' +pkgrel='2' _rc='' #_rc='-pr1' _pkgver="${pkgver}${_rc}" @@ -25,10 +25,10 @@ _source=("${_script[@]}" "${_desktop[@]}" "${_icon[@]}" "${_service[@]}" -"${_key[@]}" -"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json" -"all_servers.json"::"https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers" -) +"${_key[@]}") +#"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json" +#"all_servers.json"::"https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers") + source=("${_source[@]}") sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874' '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058' @@ -36,9 +36,7 @@ sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' 'fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd' - '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' - 'SKIP' - 'SKIP') + '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3') sha256sums_x86_64=('52d5d9edeb9b694b213e9b5b210f5dc8c3180331d724b156d69772eb7e9f8a7b') sha256sums_aarch64=('48d2db749ef006f1290e6684eeb58db24b1a3de70ba80a504c9ebcde68d9e2a8') sha256sums_armv8=('48d2db749ef006f1290e6684eeb58db24b1a3de70ba80a504c9ebcde68d9e2a8') @@ -47,6 +45,8 @@ sha256sums_armv7l=('7d949834690d43e371f101b4187b37a7ff85b4a6a79f8294ad4eccf0751b sha256sums_armv7h=('7d949834690d43e371f101b4187b37a7ff85b4a6a79f8294ad4eccf0751b1988') sha256sums_arm=('2b3bb6d28105b495877ffde0f3b3bd460d841d852a73f1ca39c4c352527b1886') sha256sums_riscv64=('d984bff876e83d149cf72854f3d5efeb8ce2cedf510bda69dc6c27b60b699288') +# 'SKIP' +# 'SKIP') #https://github.com/skycoin/skywire/releases/download/v1.3.14/skywire-v1.3.14-linux-amd64.tar.gz #https://github.com/skycoin/skywire/releases/download/v1.3.14/skywire-v1.3.14-linux-arm64.tar.gz #https://github.com/skycoin/skywire/releases/download/v1.3.14/skywire-v1.3.14-linux-armhf.tar.gz @@ -66,16 +66,16 @@ source_riscv64=( "${_release_url}-riscv64.tar.gz" ) _binary=("skywire-cli" "skywire-visor") _appbinary=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server") -build() { +#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" -} +# 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}/" diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index 308f16a2c6a8..9e73ee7610df 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -30,8 +30,6 @@ sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' 'fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' - '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba' - '146a614e4aec886536cd01c398ec7cb8b14bd6ccab80c0ef9380712be235924b' '52d5d9edeb9b694b213e9b5b210f5dc8c3180331d724b156d69772eb7e9f8a7b' '48d2db749ef006f1290e6684eeb58db24b1a3de70ba80a504c9ebcde68d9e2a8' '7d949834690d43e371f101b4187b37a7ff85b4a6a79f8294ad4eccf0751b1988' diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index 82b6e19f7649..10be1a10c8d3 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -20,9 +20,7 @@ sha256sums=('SKIP' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' 'fee14fb95e02a6c74626e9c89def7c1137192c5c23470a05c750cd97f3d3f0dd' - '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' - '773727976450acf5b981584923a93878befc2d49cfc77583ae58957a4a7425ba' - '146a614e4aec886536cd01c398ec7cb8b14bd6ccab80c0ef9380712be235924b') + '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3') pkgver() { _version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) |