diff options
| -rw-r--r-- | .SRCINFO | 33 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 13 | ||||
| -rw-r--r-- | com.skywirevpn.SkywireVPN.desktop | 2 | ||||
| -rw-r--r-- | skywire-autoconfig | 18 | ||||
| -rwxr-xr-x | updates.sh | 8 |
6 files changed, 54 insertions, 43 deletions
@@ -15,6 +15,7 @@ pkgbase = skywire-bin arch = armhf arch = armel arch = arm + license = license-free provides = skywire conflicts = skywire source = skywire-autoconfig @@ -24,26 +25,26 @@ pkgbase = skywire-bin source = skywire.png source = skywire.service source = skywire-autoconfig.service - sha256sums = 38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150 + sha256sums = 08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316 sha256sums = f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65 - sha256sums = e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539 + sha256sums = 0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8 sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495 sha256sums = 19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18 sha256sums = 55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c - 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 + source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-amd64.tar.gz + sha256sums_x86_64 = a145224d20065da87cacd2014f988f2fd48cae1339e57c5579be602c751be39e + source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-arm64.tar.gz + sha256sums_aarch64 = b80f6cc9f3ee44483514547949dd0acc3da95264a417aa8bae25aa005a4f38d5 + source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-arm64.tar.gz + sha256sums_armv8 = b80f6cc9f3ee44483514547949dd0acc3da95264a417aa8bae25aa005a4f38d5 + source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-armhf.tar.gz + sha256sums_armv7 = 9f6f088c11947239b351d33812695092aef50b6636f0ea7dfc4ac0d18b08e53a + source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-armhf.tar.gz + sha256sums_armv7l = 9f6f088c11947239b351d33812695092aef50b6636f0ea7dfc4ac0d18b08e53a + source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-armhf.tar.gz + sha256sums_armv7h = 9f6f088c11947239b351d33812695092aef50b6636f0ea7dfc4ac0d18b08e53a + source_arm = https://github.com/skycoin/skywire/releases/download/v1.1.0/skywire-v1.1.0-linux-arm.tar.gz + sha256sums_arm = 1a552e3e0645634c31ba36e3fea93ade03752d607dba28a515b59a6ace6d728d pkgname = skywire-bin @@ -6,7 +6,8 @@ _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" pkgver='1.1.0' pkgrel=1 -_rc='-pr1' +_rc='' +#_rc='-pr1' _pkgver="${pkgver}${_rc}" _tag_ver="v${_pkgver}" _pkggopath="github.com/${_githuborg}/${_pkgname}" @@ -15,8 +16,8 @@ url="https://${_pkggopath}" provides=( 'skywire' ) conflicts=( 'skywire' ) #depends=( '' ) +license=('license-free') install=skywire.install -#_scripts=${_pkgname}-scripts source=("skywire-autoconfig" "com.skywire.Skywire.desktop" "com.skywirevpn.SkywireVPN.desktop" @@ -25,20 +26,20 @@ source=("skywire-autoconfig" "skywire.service" "skywire-autoconfig.service" ) -sha256sums=('38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150' +sha256sums=('08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' - 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539' + '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18' '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c') -sha256sums_x86_64=('ac9acfdbde9a7e09c451ef167dbebb298b887a883b25299bf0be8e8aede6c6dc') -sha256sums_aarch64=('128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542') -sha256sums_armv8=('128fa08dbc6e4e4e8bee09d5353cc7ecdfd1a7e894373a7a2148a77a930ec542') -sha256sums_armv7=('29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864') -sha256sums_armv7l=('29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864') -sha256sums_armv7h=('29bf8938d7f8c4d01ced62cc9c83fa67e4414e8c783aef254af8a53e0d130864') -sha256sums_arm=('71860d197771141fcf13533a117eee31381861642f1a86236a59f60af7b988e6') +sha256sums_x86_64=('a145224d20065da87cacd2014f988f2fd48cae1339e57c5579be602c751be39e') +sha256sums_aarch64=('b80f6cc9f3ee44483514547949dd0acc3da95264a417aa8bae25aa005a4f38d5') +sha256sums_armv8=('b80f6cc9f3ee44483514547949dd0acc3da95264a417aa8bae25aa005a4f38d5') +sha256sums_armv7=('9f6f088c11947239b351d33812695092aef50b6636f0ea7dfc4ac0d18b08e53a') +sha256sums_armv7l=('9f6f088c11947239b351d33812695092aef50b6636f0ea7dfc4ac0d18b08e53a') +sha256sums_armv7h=('9f6f088c11947239b351d33812695092aef50b6636f0ea7dfc4ac0d18b08e53a') +sha256sums_arm=('1a552e3e0645634c31ba36e3fea93ade03752d607dba28a515b59a6ace6d728d') #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.dev.PKGBUILD b/cc.dev.PKGBUILD index e4ef8008a668..7563f7c34984 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -15,7 +15,7 @@ _pkgver=${pkgver} _pkgrel=${pkgrel} arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" -license=() +license=('license-free') makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') depends=() _debdeps="" @@ -32,9 +32,9 @@ source=("git+${url}.git#branch=develop" "prerm.sh" ) sha256sums=('SKIP' - '38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150' + '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' - 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539' + '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18' @@ -92,6 +92,13 @@ export GOOS=linux #create the skywire binaries cd ${srcdir}/go/src/${_pkggopath} +_msg2 "git branch:" +git branch +_msg2 "version:" +make version +_msg2 "commit:" +make commit + _cmddir=${srcdir}/go/src/${_pkggopath}/cmd _msg2 "building skychat binary" diff --git a/com.skywirevpn.SkywireVPN.desktop b/com.skywirevpn.SkywireVPN.desktop index bb0b8aa640d4..44aaeb1a0f67 100644 --- a/com.skywirevpn.SkywireVPN.desktop +++ b/com.skywirevpn.SkywireVPN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Categories=P2P;VPN;WWW;Network;Internet -Exec=skywire-cli visor vpn ui +Exec=skywire-cli vpn ui GenericName=Skywire VPN Interface Comment=Skywire VPN Interface. Icon=skywirevpn diff --git a/skywire-autoconfig b/skywire-autoconfig index 423de04848ce..f62ee4fc079d 100644 --- a/skywire-autoconfig +++ b/skywire-autoconfig @@ -197,16 +197,18 @@ _msg2 "Visor Public Key: ${_green}${_pubkey}${_nc}" if [[ $_is_hypervisor == "-i" ]]; then if [[ $(ps -o comm= -p $PPID) != "sshd" ]]; then - _msg2 "Starting now on: -${_red}http://127.0.0.1:8000${_nc}" + _msg2 "Starting now on:\n${_red}http://127.0.0.1:8000${_nc}" _vpnurl=$(skywire-cli vpn url -p) - _msg2 "Use the vpn: -${_red}${_vpnurl}${_nc}" -# ${_red}http://127.0.0.1:8000/#/vpn/${_pubkey}/${_nc}" + _msg2 "Use the vpn:\n${_red}${_vpnurl}${_nc}" fi - _lanip="$(ip addr show | grep -w inet | grep -v 127.0.0.1 | awk '{ print $2}' | cut -d "/" -f 1)" - _msg2 "Access hypervisor UI from local network here: -${_yellow}http://${_lanip}:8000${_nc}" + _hpvurl="Access hypervisor UI from local network here:" + _lanips="$(ip addr show | grep -w inet | grep -v 127.0.0.1 | awk '{ print $2}' | cut -d "/" -f 1)" + for _lanip in $_lanips + do + _hpvurl+="\n${_yellow}http://${_lanip}:8000${_nc}" + done + + _msg2 "$_hpvurl" _welcome _msg2 "run the following command on OTHER NODES to set this one as the hypervisor:" echo -e "${_cyan}skywire-autoconfig ${_yellow}${_pubkey}${_nc}" diff --git a/updates.sh b/updates.sh index 55086d0110f7..477663b13183 100755 --- a/updates.sh +++ b/updates.sh @@ -15,10 +15,10 @@ _version=${_version//v/} # _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 +#_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" |