diff options
| -rw-r--r-- | .SRCINFO | 34 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 16 | ||||
| -rw-r--r-- | skywire-autoconfig | 20 | ||||
| -rwxr-xr-x | updates.sh | 8 |
5 files changed, 60 insertions, 40 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com - pkgver = 1.0.1 - pkgrel = 4 + pkgver = 1.1.0 + pkgrel = 1 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -24,26 +24,26 @@ pkgbase = skywire-bin source = skywire.png source = skywire.service source = skywire-autoconfig.service - sha256sums = ac16dfee9ed4870ef4afc977211d1c47c36ee182c8511d41a940cdd98c483f4d + sha256sums = 57eeac39adb3d801ca0cac5c069fdc14add4e9c182569b58fcc4d41aac8efec4 sha256sums = f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65 sha256sums = e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539 sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495 sha256sums = c8d9f7394763997bb3917c55dd288d431d7054c7f1edec55540a4c02600dd7d3 sha256sums = 55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c - source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-amd64.tar.gz - sha256sums_x86_64 = 6cbbadb07ca6668dc04a91565b08e590e844422a28a813f1bb76a184b422432e - source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-arm64.tar.gz - sha256sums_aarch64 = 61dc18d71d766e707ccbdc9c0f5b0bbf0a992e6acdc0c53c1c9cba6ecc85f601 - source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-arm64.tar.gz - sha256sums_armv8 = 61dc18d71d766e707ccbdc9c0f5b0bbf0a992e6acdc0c53c1c9cba6ecc85f601 - source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-armhf.tar.gz - sha256sums_armv7 = 1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0 - source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-armhf.tar.gz - sha256sums_armv7l = 1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0 - source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-armhf.tar.gz - sha256sums_armv7h = 1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0 - source_arm = https://github.com/skycoin/skywire/releases/download/v1.0.1/skywire-v1.0.1-linux-arm.tar.gz - sha256sums_arm = 6182f947e66a41c6793addd08ab8cc00fa09c132001e13f05e8f11464987c7ea + source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-amd64.tar.gz + sha256sums_x86_64 = ac9acfdbde9a7e09c451ef167dbebb298b887a883b25299bf0be8e8aede6c6dc + source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-arm64.tar.gz + sha256sums_aarch64 = 128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542 + source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-arm64.tar.gz + sha256sums_armv8 = 128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542 + source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-armhf.tar.gz + sha256sums_armv7 = 29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864 + source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-armhf.tar.gz + sha256sums_armv7l = 29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864 + source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-armhf.tar.gz + sha256sums_armv7h = 29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864 + source_arm = https://github.com/skycoin/skywire/releases/download/v1.1.0-pr1/skywire-v1.1.0-pr1-linux-arm.tar.gz + sha256sums_arm = 71860d197771141fcf13533a117eee31381861642f1a86236a59f60af7b988e6 pkgname = skywire-bin @@ -4,9 +4,9 @@ pkgname=skywire-bin _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" -pkgver='1.0.1' -pkgrel=4 -_rc='' +pkgver='1.1.0' +pkgrel=1 +_rc='-pr1' _pkgver="${pkgver}${_rc}" _tag_ver="v${_pkgver}" _pkggopath="github.com/${_githuborg}/${_pkgname}" @@ -25,20 +25,20 @@ source=("skywire-autoconfig" "skywire.service" "skywire-autoconfig.service" ) -sha256sums=('ac16dfee9ed4870ef4afc977211d1c47c36ee182c8511d41a940cdd98c483f4d' +sha256sums=('57eeac39adb3d801ca0cac5c069fdc14add4e9c182569b58fcc4d41aac8efec4' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' 'c8d9f7394763997bb3917c55dd288d431d7054c7f1edec55540a4c02600dd7d3' '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c') -sha256sums_x86_64=('6cbbadb07ca6668dc04a91565b08e590e844422a28a813f1bb76a184b422432e') -sha256sums_aarch64=('61dc18d71d766e707ccbdc9c0f5b0bbf0a992e6acdc0c53c1c9cba6ecc85f601') -sha256sums_armv8=('61dc18d71d766e707ccbdc9c0f5b0bbf0a992e6acdc0c53c1c9cba6ecc85f601') -sha256sums_armv7=('1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0') -sha256sums_armv7l=('1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0') -sha256sums_armv7h=('1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0') -sha256sums_arm=('6182f947e66a41c6793addd08ab8cc00fa09c132001e13f05e8f11464987c7ea') +sha256sums_x86_64=('ac9acfdbde9a7e09c451ef167dbebb298b887a883b25299bf0be8e8aede6c6dc') +sha256sums_aarch64=('128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542') +sha256sums_armv8=('128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542') +sha256sums_armv7=('29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864') +sha256sums_armv7l=('29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864') +sha256sums_armv7h=('29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864') +sha256sums_arm=('71860d197771141fcf13533a117eee31381861642f1a86236a59f60af7b988e6') #https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-amd64.tar.gz #https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm64.tar.gz #https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-armhf.tar.gz diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index d6844c8fb4c3..325d6625a017 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -4,11 +4,11 @@ pkgname=skywire-bin _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package" -pkgver='1.0.1' -_rc='' +pkgver='1.1.0' +_rc='-pr1' _pkgver="${pkgver}${_rc}" _tag_ver="v${_pkgver}" -pkgrel=4 +pkgrel=1 _pkgrel=${pkgrel} _pkggopath="github.com/${_githuborg}/${_pkgname}" _pkgarch=$(dpkg --print-architecture) @@ -43,11 +43,11 @@ noextract=( "${_binarchive}armhf.tar.gz" "${_release_url}-arm.tar.gz" ) -sha256sums=('6cbbadb07ca6668dc04a91565b08e590e844422a28a813f1bb76a184b422432e' - '61dc18d71d766e707ccbdc9c0f5b0bbf0a992e6acdc0c53c1c9cba6ecc85f601' - '1633c917e1468de0295d7d3b30059156f194e18722578cb90fd49cd683a7f5d0' - '6182f947e66a41c6793addd08ab8cc00fa09c132001e13f05e8f11464987c7ea' - 'ac16dfee9ed4870ef4afc977211d1c47c36ee182c8511d41a940cdd98c483f4d' +sha256sums=('ac9acfdbde9a7e09c451ef167dbebb298b887a883b25299bf0be8e8aede6c6dc' + '128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542' + '29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864' + '71860d197771141fcf13533a117eee31381861642f1a86236a59f60af7b988e6' + '57eeac39adb3d801ca0cac5c069fdc14add4e9c182569b58fcc4d41aac8efec4' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' diff --git a/skywire-autoconfig b/skywire-autoconfig index b1ae12137129..ad1a53ee1f73 100644 --- a/skywire-autoconfig +++ b/skywire-autoconfig @@ -92,6 +92,12 @@ _config_gen() { unset _1 _is_hypervisor="-i" fi + # 1 as argument drops remote hypervisors and does not create the local hv config + if [[ ${_1} == "1" ]]; then + _retain_hv="" + unset _1 + _is_hypervisor="" + fi # create the flag to set the remote hypervisor(s) if [[ ! -z ${_1} ]]; then _retain_hv="" @@ -101,11 +107,11 @@ _config_gen() { ##generate (hyper)visor configuration## # show config gen command used _msg3 "Generating skywire config with command: -${_cyan}skywire-cli ${_yellow}config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks}${_nc}" - skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} >> /dev/null 2>&1 +${_cyan}skywire-cli ${_yellow}config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor}${_nc}" + skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor} >> /dev/null 2>&1 if [[ ${?} != 0 ]]; then #print the error! - skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} + skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor} _err=$? _errmsg2 "error generating skywire config" exit ${_err} @@ -128,6 +134,14 @@ config path: ${_purple}/opt/skywire/skywire.json${_nc}" if [[ ( ${PUBLICRPC} -eq "1") ]]; then _public_rpc="--publicrpc " fi +#use public flag with env VISORISPUBLIC=1 +if [[ ( ${VISORISPUBLIC} -eq "1") ]]; then + _is_public_visor="--public " +fi +#use public flag with env NOAUTOCONNECT=1 +if [[ ( ${NOAUTOCONNECT} -eq "1") ]]; then + _no_autoconnect="--autoconn " +fi #enable VPN server automatically on config re-gen with env VPNSERVER=1 if [[ ${VPNSERVER} -eq "1" ]]; then _vpn_server="--servevpn " diff --git a/updates.sh b/updates.sh index 5c2bce7012eb..779fa27b0740 100755 --- a/updates.sh +++ b/updates.sh @@ -8,11 +8,17 @@ _version=$(git ls-remote --tags --refs --sort="version:refname" https://github.c _version=${_version##*/} _version=${_version%%-*} _version=${_version//v/} -#Uncomment to use release candidates during pre-release testing +#Uncomment to use release candidates or pre-releases for testing +#get release candidate version from source repo #_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -rc) #if [[ $_vrc != "" ]]; then # _vrc="-${_vrc##*-}" #fi +#get release candidate version from source repo +_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -pr) +if [[ $_vrc != "" ]]; then + _vrc="-${_vrc##*-}" +fi echo ${_version} echo ${_vrc} echo "updating checksums and version for PKGBUILD" |