diff options
| author | Moses Narrow | 2023-02-05 09:24:28 -0600 |
|---|---|---|
| committer | Moses Narrow | 2023-02-05 09:24:28 -0600 |
| commit | 37f8e696e2776d9616451ccb707dffeb082f8e00 (patch) | |
| tree | 23fc49b1750f4bcfed1d384ab01fc1edf6b75e29 | |
| parent | 667efd7426d478d46361dc1df4b9069134d6ba68 (diff) | |
| download | aur-37f8e696e2776d9616451ccb707dffeb082f8e00.tar.gz | |
fix systemd service, change autoconfig to print reward address or show how to set it if nset ; link to mainnet rules if reward address is unset
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 4 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | skywire-autoconfig | 27 | ||||
| -rw-r--r-- | skywire.service | 2 |
6 files changed, 31 insertions, 18 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com pkgver = 1.3.3 - pkgrel = 1 + pkgrel = 2 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -26,12 +26,12 @@ pkgbase = skywire-bin source = skywire.png source = skywire.service source = skywire-autoconfig.service - sha256sums = 08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316 + sha256sums = 57ec0639c47da596f31ac6b299b1688e764fbcb707e7921872fbbe7aaeb1901f sha256sums = f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65 sha256sums = 0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8 sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495 - sha256sums = 6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d + sha256sums = 9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da sha256sums = 8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3 source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.3/skywire-v1.3.3-linux-amd64.tar.gz sha256sums_x86_64 = aeff9a2800e9a5272d4a5db01aa46f292f4389134e2f0bcfc9945c493a1d56ef @@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" pkgver='1.3.3' -pkgrel=1 +pkgrel=2 _rc='' #_rc='-pr1' _pkgver="${pkgver}${_rc}" @@ -27,12 +27,12 @@ _source=("${_script[@]}" "${_service[@]}" ) source=("${_source[@]}") -sha256sums=('08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' +sha256sums=('57ec0639c47da596f31ac6b299b1688e764fbcb707e7921872fbbe7aaeb1901f' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' - '6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d' + '9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3') sha256sums_x86_64=('aeff9a2800e9a5272d4a5db01aa46f292f4389134e2f0bcfc9945c493a1d56ef') sha256sums_aarch64=('1a7035b418f0f681cf482aaaf3e41e3be516e2cdd10a0a79a4f4a12b844fa141') diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index c8b8f0071f10..76f1d3eefddf 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -25,12 +25,12 @@ noextract=( "${_binarchive}armhf.tar.gz" "${_release_url}-arm.tar.gz" ) -sha256sums=('08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' +sha256sums=('57ec0639c47da596f31ac6b299b1688e764fbcb707e7921872fbbe7aaeb1901f' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' - '6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d' + '9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' 'aeff9a2800e9a5272d4a5db01aa46f292f4389134e2f0bcfc9945c493a1d56ef' '1a7035b418f0f681cf482aaaf3e41e3be516e2cdd10a0a79a4f4a12b844fa141' diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index bc40dece630c..61593c1ae83a 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -14,12 +14,12 @@ source=("git+${url}.git#branch=develop" "${_source[@]}" ) sha256sums=('SKIP' - '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' + '57ec0639c47da596f31ac6b299b1688e764fbcb707e7921872fbbe7aaeb1901f' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' - '6d40c32452151145fef51d87cd09423cceb4d7205869e8f80fc074cd5e68f98d' + '9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3') pkgver() { diff --git a/skywire-autoconfig b/skywire-autoconfig index f62ee4fc079d..1a29b9550676 100644..100755 --- a/skywire-autoconfig +++ b/skywire-autoconfig @@ -69,12 +69,23 @@ _errmsg2() { } #helpful text _welcome(){ - if [[ $(uname -m) == *"arm"* ]]; then - _msg2 "register your public key:" - _msg2 "${_blue}https://whitelist.skycoin.com/${_nc}" - _msg2 "track uptime:" - _msg2 "${_blue}http://ut.skywire.skycoin.com/uptimes${_nc}" - fi +# if [[ $(uname -m) == *"arm"* ]]; then +skywire-cli reward -r >> /dev/null 2>&1 +if [[ ${?} == 0 ]]; then +_msg2 "skycoin reward address: +${_green}$(skywire-cli reward -r)${_nc}" +else + if [[ $(uname -m) == *"arm"* ]]; then + _msg2 "reward eligibility rules: +${_yellow}https://github.com/skycoin/skywire/blob/develop/mainnet_rules.md${_nc}" + _msg2 "set your skycoin reward address: +${_cyan}skywire-cli ${_yellow}reward ${_green}<skycoin-address>${_nc}" + fi +fi + _msg2 "track uptime: + ${_blue}http://ut.skywire.skycoin.com/uptimes${_nc} + ${_blue}http://ut.skywire.skycoin.com/uptimes?v=v2${_nc}" +# fi _msg2 "support: ${_blue}https://t.me/skywire${_nc}" } @@ -198,7 +209,9 @@ ${_green}${_pubkey}${_nc}" if [[ $_is_hypervisor == "-i" ]]; then if [[ $(ps -o comm= -p $PPID) != "sshd" ]]; then _msg2 "Starting now on:\n${_red}http://127.0.0.1:8000${_nc}" - _vpnurl=$(skywire-cli vpn url -p) +# _vpnurl=$(skywire-cli vpn url -p) +# _msg2 "Use the vpn:\n${_red}${_vpnurl}${_nc}" + _vpnurl="http://127.0.0.1:8000/#/vpn/${_pubkey}" _msg2 "Use the vpn:\n${_red}${_vpnurl}${_nc}" fi _hpvurl="Access hypervisor UI from local network here:" diff --git a/skywire.service b/skywire.service index 72ac10d1c007..04a923859f05 100644 --- a/skywire.service +++ b/skywire.service @@ -5,7 +5,7 @@ Wants=network-online.target [Service] Type=simple Environment="SYSTEMDCHILD=1" -ExecStart=/usr/bin/skywire -p $AUTOPEERHV +ExecStart=/usr/bin/skywire -p Restart=always RestartSec=20 TimeoutSec=30 |