diff options
author | Moses Narrow | 2023-03-02 14:07:52 -0600 |
---|---|---|
committer | Moses Narrow | 2023-03-02 14:07:52 -0600 |
commit | 4f2a1fb0b291e3c168805ebd40d5ac8db3e764d7 (patch) | |
tree | bfba8ce044471ffda3fb092951a84ac05018de3b | |
parent | ecbc2bc115f9085cb284962cdeef228d43179b75 (diff) | |
download | aur-4f2a1fb0b291e3c168805ebd40d5ac8db3e764d7.tar.gz |
bump version to 1.3.5 ; add monitor.PKGBUILD
-rw-r--r-- | .SRCINFO | 38 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | cc.deb.PKGBUILD | 26 | ||||
-rw-r--r-- | cc.dev.PKGBUILD | 8 | ||||
-rw-r--r-- | monitor.PKGBUILD | 53 | ||||
-rw-r--r-- | monitor.install | 17 | ||||
-rw-r--r-- | override.conf | 3 | ||||
-rwxr-xr-x | skywire-autoconfig | 17 | ||||
-rw-r--r-- | skywire-monitor.service | 14 | ||||
-rw-r--r-- | skywire.desktop | 1 | ||||
-rw-r--r-- | skywire.service | 2 | ||||
-rw-r--r-- | skywirevpn.desktop | 3 | ||||
-rwxr-xr-x | updates.sh | 6 |
13 files changed, 148 insertions, 64 deletions
@@ -1,6 +1,6 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com - pkgver = 1.3.4 + pkgver = 1.3.5 pkgrel = 1 url = https://github.com/skycoin/skywire install = skywire.install @@ -27,27 +27,27 @@ pkgbase = skywire-bin source = skywire.service source = skywire-autoconfig.service source = skycoin - sha256sums = 28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00 - sha256sums = f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65 - sha256sums = 0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8 + sha256sums = adaab458dd6b839b35bf1214a6e6c7d8eb4ecb475130bcd61d97c7357d05d63a + sha256sums = 40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058 + sha256sums = 00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495 - sha256sums = 9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da + sha256sums = 44a25adf22c87bf7a2102a7fc1c9f566d239ef3f3d7b3dc2bcd0f2c632695a17 sha256sums = 8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3 sha256sums = 41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14 - source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-amd64.tar.gz - sha256sums_x86_64 = 1037ecc2df9e7a0f825db88f9fe5aee4450576511dc321f1b66b0cae4f5d54b6 - source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-arm64.tar.gz - sha256sums_aarch64 = 5c2dbe82659dd36caa70073559801d40e81b00d3b786c130cc5390aacf6449f4 - source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-arm64.tar.gz - sha256sums_armv8 = 5c2dbe82659dd36caa70073559801d40e81b00d3b786c130cc5390aacf6449f4 - source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-armhf.tar.gz - sha256sums_armv7 = 77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a - source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-armhf.tar.gz - sha256sums_armv7l = 77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a - source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-armhf.tar.gz - sha256sums_armv7h = 77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a - source_arm = https://github.com/skycoin/skywire/releases/download/v1.3.4/skywire-v1.3.4-linux-arm.tar.gz - sha256sums_arm = 369a6ac68a9f81cbc049d0f3a239231b4eb880cbd33914eb9f7bb7d3487f9f8b + source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-amd64.tar.gz + sha256sums_x86_64 = 672ccf89ea6e42025c5809cd4d086c8b587d41be922ab0446c239bf0caabc872 + source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-arm64.tar.gz + sha256sums_aarch64 = 086e0ec876df79febd559ee9e0160db808b9ef64d7cb8a4c9bd393b70bf83a1c + source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-arm64.tar.gz + sha256sums_armv8 = 086e0ec876df79febd559ee9e0160db808b9ef64d7cb8a4c9bd393b70bf83a1c + source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-armhf.tar.gz + sha256sums_armv7 = 06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00 + source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-armhf.tar.gz + sha256sums_armv7l = 06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00 + source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-armhf.tar.gz + sha256sums_armv7h = 06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00 + source_arm = https://github.com/skycoin/skywire/releases/download/v1.3.5/skywire-v1.3.5-linux-arm.tar.gz + sha256sums_arm = e6e496db362bfaf31235d24d3673fdb71f4e93560cb9fcff362239a59358ae3e pkgname = skywire-bin @@ -3,7 +3,7 @@ pkgname=skywire-bin _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" -pkgver='1.3.4' +pkgver='1.3.5' pkgrel=1 _rc='' #_rc='-pr1' @@ -29,21 +29,21 @@ _source=("${_script[@]}" "${_key[@]}" ) source=("${_source[@]}") -sha256sums=('28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00' - 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' - '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' +sha256sums=('adaab458dd6b839b35bf1214a6e6c7d8eb4ecb475130bcd61d97c7357d05d63a' + '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058' + '00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' - '9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da' + '44a25adf22c87bf7a2102a7fc1c9f566d239ef3f3d7b3dc2bcd0f2c632695a17' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' '41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14') -sha256sums_x86_64=('1037ecc2df9e7a0f825db88f9fe5aee4450576511dc321f1b66b0cae4f5d54b6') -sha256sums_aarch64=('5c2dbe82659dd36caa70073559801d40e81b00d3b786c130cc5390aacf6449f4') -sha256sums_armv8=('5c2dbe82659dd36caa70073559801d40e81b00d3b786c130cc5390aacf6449f4') -sha256sums_armv7=('77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a') -sha256sums_armv7l=('77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a') -sha256sums_armv7h=('77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a') -sha256sums_arm=('369a6ac68a9f81cbc049d0f3a239231b4eb880cbd33914eb9f7bb7d3487f9f8b') +sha256sums_x86_64=('672ccf89ea6e42025c5809cd4d086c8b587d41be922ab0446c239bf0caabc872') +sha256sums_aarch64=('086e0ec876df79febd559ee9e0160db808b9ef64d7cb8a4c9bd393b70bf83a1c') +sha256sums_armv8=('086e0ec876df79febd559ee9e0160db808b9ef64d7cb8a4c9bd393b70bf83a1c') +sha256sums_armv7=('06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00') +sha256sums_armv7l=('06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00') +sha256sums_armv7h=('06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00') +sha256sums_arm=('e6e496db362bfaf31235d24d3673fdb71f4e93560cb9fcff362239a59358ae3e') #https://github.com/skycoin/skywire/releases/download/v1.2.1/skywire-v1.2.1-linux-amd64.tar.gz #https://github.com/skycoin/skywire/releases/download/v1.2.1/skywire-v1.2.1-linux-arm64.tar.gz #https://github.com/skycoin/skywire/releases/download/v1.2.1/skywire-v1.2.1-linux-armhf.tar.gz diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index 408a10012fbd..5e32a3cb1586 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -25,18 +25,18 @@ noextract=( "${_binarchive}armhf.tar.gz" "${_release_url}-arm.tar.gz" ) -sha256sums=('28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00' - 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' - '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' +sha256sums=('adaab458dd6b839b35bf1214a6e6c7d8eb4ecb475130bcd61d97c7357d05d63a' + '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058' + '00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' - '9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da' + '44a25adf22c87bf7a2102a7fc1c9f566d239ef3f3d7b3dc2bcd0f2c632695a17' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' '41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14' - '1037ecc2df9e7a0f825db88f9fe5aee4450576511dc321f1b66b0cae4f5d54b6' - '5c2dbe82659dd36caa70073559801d40e81b00d3b786c130cc5390aacf6449f4' - '77060322651466a817150843312b0490d20314208992ab4eca0b181993c3093a' - '369a6ac68a9f81cbc049d0f3a239231b4eb880cbd33914eb9f7bb7d3487f9f8b' + '672ccf89ea6e42025c5809cd4d086c8b587d41be922ab0446c239bf0caabc872' + '086e0ec876df79febd559ee9e0160db808b9ef64d7cb8a4c9bd393b70bf83a1c' + '06655c78729edc50d388bc896260154ad443c4773042292b914dfbe76b097f00' + 'e6e496db362bfaf31235d24d3673fdb71f4e93560cb9fcff362239a59358ae3e' '7b17a55e64d1371fecd24edc3da7c6a762cf2b3d058f6fc4a5dc7c5f9b4cff09' '233ccf0e87b37e782828f53960e05e478cf381f61bbfdb16a0cc0254ee8be7c2') @@ -59,16 +59,6 @@ build() { } package() { -GOBIN="${srcdir}/" -_GOAPPS="${GOBIN}/apps" -#declare the _pkgdir and systemd directory -_pkgdir="${pkgdir}" -_systemddir="usr/lib/systemd/system" -_package -} - - -package() { for _i in "${_pkgarches[@]}"; do _msg2 "_pkgarch=${_i}" diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index 201357df4b6e..508ade8e3c5d 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -14,12 +14,12 @@ source=("git+${url}.git#branch=develop" "${_source[@]}" ) sha256sums=('SKIP' - '28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00' - 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' - '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' + 'adaab458dd6b839b35bf1214a6e6c7d8eb4ecb475130bcd61d97c7357d05d63a' + '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058' + '00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' - '9c94295df9dadbdbd5b891c6669c112e69ede97922791579ffdf415130a084da' + '44a25adf22c87bf7a2102a7fc1c9f566d239ef3f3d7b3dc2bcd0f2c632695a17' '8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3' '41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14') diff --git a/monitor.PKGBUILD b/monitor.PKGBUILD new file mode 100644 index 000000000000..82e7ef339bb0 --- /dev/null +++ b/monitor.PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Moses Narrow <moses@skycoin.com> +pkgname=skywire-monitor +_pkgname=${pkgname} +pkgdesc="a simple service and drop-in config - view skywire service status and debug logging in browser" +pkgver='1.3.5' +pkgrel=1 +_pkgver="${pkgver}" +arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) +license=('license-free') +depends=("gnu-netcat" "ansifilter" "expect" "skywire") +_service=("skywire-monitor.service") +_serviceconf=("override.conf") +install=monitor.install +_source=( +"${_service[@]}" +"${_serviceconf[@]}" +) +source=("${_source[@]}") +sha256sums=('72c189a1c1994e90cab0ab3e21a3bf2932b229210a0bc9e296d6a4400e2a52a1' + 'f26f0d3aa3baeb22fe1f0c94fe86113a638195f0070c5a2cd80e72463de5319a') + +package() { +#declare the _pkgdir and systemd directory +_pkgdir="${pkgdir}" +_systemddir="usr/lib/systemd/system" +_msg2 'Installing systemd services' +for _i in "${_service[@]}" ; do + _msg3 ${_i} + install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/${_systemddir}/${_i}" +done +_msg2 'Installing skywire service drop-in config' +for _i in "${_serviceconf[@]}" ; do + _msg3 ${_i} + install -Dm644 "${srcdir}/${_i}" "${_pkgdir}/${_systemddir}/skywire.service.d/${_i}" +done + +if command -v tree &> /dev/null ; then +_msg2 'package tree' + tree -a ${_pkgdir} +fi +} + +_msg2() { +(( QUIET )) && return +local mesg=$1; shift +printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" +} + +_msg3() { +(( QUIET )) && return +local mesg=$1; shift +printf "${BLUE} -->${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" +} diff --git a/monitor.install b/monitor.install new file mode 100644 index 000000000000..bf71b4cb058a --- /dev/null +++ b/monitor.install @@ -0,0 +1,17 @@ + +post_install() { +systemctl is-active --quiet skywire && systemctl daemon-reload && systemctl restart skywire && systemctl enable --now skywire-monitor 2> /dev/null +} + + +post_upgrade() { +post_install +} + +pre-remove() { +systemctl disable --now skywire-monitor +} + +post_remove() { +systemctl is-active --quiet skywire && systemctl daemon-reload && systemctl restart skywire +} diff --git a/override.conf b/override.conf new file mode 100644 index 000000000000..4d5eb6183c02 --- /dev/null +++ b/override.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=/bin/bash -c 'unbuffer skywire -p --loglvl debug | tee -a /opt/skywire/local/custom/skywire.log' diff --git a/skywire-autoconfig b/skywire-autoconfig index 03a8b1203986..a8d35f163f3b 100755 --- a/skywire-autoconfig +++ b/skywire-autoconfig @@ -118,11 +118,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} ${_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 +${_cyan}skywire-cli ${_yellow}config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor} ${_dmsghttp} ${_url}${_nc}" + skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor} ${_dmsghttp} ${_url} >> /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} ${_no_autoconnect} ${_is_public_visor} + skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor} ${_dmsghttp} ${_url} _err=$? _errmsg2 "error generating skywire config" exit ${_err} @@ -142,6 +142,14 @@ config path: ${_purple}/opt/skywire/skywire.json${_nc}" } #only use public rpc flag with env PUBLICRPC=1 +if [[ ( ${URL} -ne "") ]]; then + _url="${URL}" +fi +#only use public rpc flag with env PUBLICRPC=1 +if [[ ( ${DMSGHTTP} -eq "1") ]]; then + _dmsghttp="--dmsghttp " +fi +#only use public rpc flag with env PUBLICRPC=1 if [[ ( ${PUBLICRPC} -eq "1") ]]; then _public_rpc="--publicrpc " fi @@ -243,6 +251,7 @@ if [[ $_is_hypervisor == "-i" ]]; then _msg2 "to see this text again run: ${_cyan}skywire-autoconfig${_nc}" else _msg2 "${_blue}Skywire${_nc} starting in visor mode" - _msg2 "Visor Public Key: ${_green}${_pubkey}${_nc}" + _hvpk=$(grep -A 2 "\"hypervisors\": \[" /opt/skywire/skywire.json | grep -v "\[\]" | head -n2 | tail -n1 | cut -d '"' -f2) + _msg2 "hypervisor Public Key: ${_purple}${_hvpk}${_nc}" _welcome fi diff --git a/skywire-monitor.service b/skywire-monitor.service new file mode 100644 index 000000000000..f7f7d90c036a --- /dev/null +++ b/skywire-monitor.service @@ -0,0 +1,14 @@ +[Unit] +Description=http endpoint for skywire logs + +[Service] +Type=simple +Environment="SYSTEMD_COLORS=true" +ExecStartPre=/bin/bash -c 'systemctl status skywire --lines=0 | tee /tmp/skylog.html > /dev/null ; echo -e "\nshowing last 300 lines of skywire logs most recent first\n" | tee -a /tmp/skylog.html > /dev/null ; journalctl -x -u skywire.service -b --output cat | tail -n 300 | tac | tee -a /tmp/skylog.html > /dev/null ; ansifilter --html -i /tmp/skylog.html -o /tmp/skylog0.html ; sed -i -e "s/●/\●/g" -e "s/○/\○/g" -e "s/×/\❌/g" -e "s/─/\─/g" -e "s/└/\└/g" -e "s/├/\├/g" -e "s/<body>/<body style=\\"background-color:black;color:white;\\">/g" /tmp/skylog0.html ; tail -n 1 /tmp/skylog0.html | wc -c | xargs -I {} truncate /tmp/skylog0.html -s -{} ; cat /tmp/skylog0.html | wc -m | tee /tmp/skylog.wc > /dev/null' +ExecStart=/bin/nc -vlc -p 7998 -e 'printf "HTTP/1.0 200 OK\r\nContent-Length: " ; cat /tmp/skylog.wc ; printf "\r\n" ; cat /tmp/skylog0.html' +Restart=always +StartLimitInterval=1min +StartLimitBurst=60 + +[Install] +WantedBy=multi-user.target diff --git a/skywire.desktop b/skywire.desktop index 63b3ade988b0..30a04d77df01 100644 --- a/skywire.desktop +++ b/skywire.desktop @@ -2,7 +2,6 @@ Categories=P2P;VPN;WWW;Network;Internet Exec=xdg-open http://127.0.0.1:8000/ GenericName=Skywire Hypervisor Interface -Comment=Skywire: Building a new Internet. Icon=skywire MimeType=application/x-skywire; Name=Skywire diff --git a/skywire.service b/skywire.service index 04a923859f05..8398b131065d 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 +ExecStart=/bin/bash -c 'skywire -p --loglvl debug | tee -a /opt/skywire/local/custom/skywire.log' Restart=always RestartSec=20 TimeoutSec=30 diff --git a/skywirevpn.desktop b/skywirevpn.desktop index 44aaeb1a0f67..6fb542966cbb 100644 --- a/skywirevpn.desktop +++ b/skywirevpn.desktop @@ -1,8 +1,7 @@ [Desktop Entry] Categories=P2P;VPN;WWW;Network;Internet Exec=skywire-cli vpn ui -GenericName=Skywire VPN Interface -Comment=Skywire VPN Interface. +GenericName=Skywire VPN UI Icon=skywirevpn MimeType=application/x-skywire; Name=SkywireVPN diff --git a/updates.sh b/updates.sh index ac41115fb910..e2668f6c6829 100755 --- a/updates.sh +++ b/updates.sh @@ -1,4 +1,5 @@ #!/bin/bash + _version=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1) _version=${_version##*/} _version=${_version%%-*} @@ -20,13 +21,12 @@ echo "remote version="${_vrc} fi echo "updating checksums and version for PKGBUILD" sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD && updpkgsums -[[ -f cc.deb.PKGBUILD ]] && echo "updating checksums for cc.deb.PKGBUILD" && updpkgsums cc.deb.PKGBUILD -[[ -f cc.dev.PKGBUILD ]] && echo "updating checksums for cc.dev.PKGBUILD" && updpkgsums cc.dev.PKGBUILD +find *.PKGBUILD | parallel unbuffer updpkgsums {} echo "creating .SRCINFO" makepkg --printsrcinfo > .SRCINFO #sha256sum skywire-scripts.tar.gz echo "don't forget to increment pkgrel if you edited the PKGBUILD" source PKGBUILD && echo "pkgver=${pkgver}" && echo "pkgrel=${pkgrel}" echo -echo "git add -f " *PKGBUILD " .SRCINFO skywire-autoconfig " *.desktop *.png *.service *.sh " skywire.install" +echo "git add -f " *PKGBUILD " .SRCINFO skywire-autoconfig " *.desktop *.png *.service *.sh *.conf *.install echo 'git commit -m " "' |