diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 29 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 35 | ||||
| -rw-r--r-- | skywire.desktop | 12 | ||||
| -rw-r--r-- | skywirevpn.desktop | 12 | ||||
| -rwxr-xr-x | updates.sh | 8 |
7 files changed, 47 insertions, 62 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com pkgver = 1.2.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -19,8 +19,8 @@ pkgbase = skywire-bin provides = skywire conflicts = skywire source = skywire-autoconfig - source = com.skywire.Skywire.desktop - source = com.skywirevpn.SkywireVPN.desktop + source = skywire.desktop + source = skywirevpn.desktop source = skywirevpn.png source = skywire.png source = skywire.service @@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" pkgver='1.2.1' -pkgrel=1 +pkgrel=2 _rc='' #_rc='-pr1' _pkgver="${pkgver}${_rc}" @@ -14,12 +14,11 @@ arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'arm url="https://${_pkggopath}" provides=( 'skywire' ) conflicts=( 'skywire' ) -#depends=( '' ) license=('license-free') install=skywire.install source=("skywire-autoconfig" -"com.skywire.Skywire.desktop" -"com.skywirevpn.SkywireVPN.desktop" +"skywire.desktop" +"skywirevpn.desktop" "skywirevpn.png" "skywire.png" "skywire.service" diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index 221714ee481c..6955dcdec6e9 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -1,25 +1,14 @@ # Maintainer: Moses Narrow <moe_narrow@use.startmail.com> -pkgname=skywire-bin -_pkgname=${pkgname/-bin/} -_githuborg=skycoin -pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package" -pkgver='1.2.1' -_rc='' -#_rc='-pr1' -_pkgver="${pkgver}${_rc}" -_tag_ver="v${_pkgver}" -pkgrel=1 +source PKGBUILD +_pkgver=${pkgver} _pkgrel=${pkgrel} -_pkggopath="github.com/${_githuborg}/${_pkgname}" +pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package" _pkgarch=$(dpkg --print-architecture) _pkgarches=('amd64' 'arm64' 'armhf' 'armel') arch=('any') -url="https://${_pkggopath}" +license=('license-free') makedepends=('dpkg') -depends=() _debdeps="" -#_debdeps="" -license=('license-free') _binarchive=("${_pkgname}-${_tag_ver}-linux") _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}") source=( @@ -28,8 +17,8 @@ source=( "${_release_url}-armhf.tar.gz" "${_release_url}-arm.tar.gz" "skywire-autoconfig" -"com.skywire.Skywire.desktop" -"com.skywirevpn.SkywireVPN.desktop" +"skywire.desktop" +"skywirevpn.desktop" "skywirevpn.png" "skywire.png" "skywire.service" @@ -163,9 +152,3 @@ done #exit so the arch package doesn't get built exit } - -_msg2() { - (( QUIET )) && return - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" -} diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index d60230d4ffee..383a11f3f5de 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -1,29 +1,18 @@ # Maintainer: Moses Narrow <moe_narrow@use.startmail.com> -# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com> -_projectname=skycoin -pkgname=skywire-bin -_pkgname=${pkgname/-bin/} -_githuborg=${_projectname} + source PKGBUILD + _pkgver=${pkgver} + _pkgrel=${pkgrel} pkgdesc="Skywire Mainnet Node implementation; develop branch - Debian testing package." -_pkggopath="github.com/${_githuborg}/${_pkgname}" -pkgver='1.2.1' -pkgrel=1 -#pkgrel=1 _pkgarch=$(dpkg --print-architecture) _pkgarches=('armhf' 'arm64' 'amd64' 'armel') -_pkgver=${pkgver} -_pkgrel=${pkgrel} -arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) -url="https://${_pkggopath}" +arch=( 'any' ) license=('license-free') makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') -depends=() _debdeps="" -install=skywire.install source=("git+${url}.git#branch=develop" "skywire-autoconfig" -"com.skywire.Skywire.desktop" -"com.skywirevpn.SkywireVPN.desktop" +"skywire.desktop" +"skywirevpn.desktop" "skywirevpn.png" "skywire.png" "skywire.service" @@ -224,15 +213,3 @@ done #exit so the arch package doesn't get built exit } - -_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}${BOLD} ${mesg}${ALL_OFF}\n" "$@" -} diff --git a/skywire.desktop b/skywire.desktop new file mode 100644 index 000000000000..63b3ade988b0 --- /dev/null +++ b/skywire.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +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 +Terminal=false +Type=Application +StartupNotify=false +Keywords=vpn;p2p;www;network;internet; diff --git a/skywirevpn.desktop b/skywirevpn.desktop new file mode 100644 index 000000000000..44aaeb1a0f67 --- /dev/null +++ b/skywirevpn.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Categories=P2P;VPN;WWW;Network;Internet +Exec=skywire-cli vpn ui +GenericName=Skywire VPN Interface +Comment=Skywire VPN Interface. +Icon=skywirevpn +MimeType=application/x-skywire; +Name=SkywireVPN +Terminal=false +Type=Application +StartupNotify=false +Keywords=vpn;p2p;www;network;internet; diff --git a/updates.sh b/updates.sh index 58f3f454b04d..674fcbed2deb 100755 --- a/updates.sh +++ b/updates.sh @@ -19,8 +19,10 @@ _version=${_version//v/} #if [[ $_vrc != "" ]]; then # _vrc="-${_vrc##*-}" #fi -echo ${_version} -echo ${_vrc} +echo "remote version="${_version} +if [[ ${_vrc} != "" ]]; then +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 and version for cc.deb.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" cc.deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" cc.deb.PKGBUILD && updpkgsums cc.deb.PKGBUILD && _ccdebPKGBUILD="cc.deb.PKGBUILD" @@ -34,5 +36,5 @@ makepkg --printsrcinfo > .SRCINFO 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 ${_debPKGBUILD} ${_ccdebPKGBUILD} ${_ccdevPKGBUILD} ${_devPKGBUILD} ${_gitPKGBUILD} PKGBUILD .SRCINFO skywire-autoconfig com.skywire.Skywire.desktop com.skywirevpn.SkywireVPN.desktop skywirevpn.png skywire.png skywire.service skywire-autoconfig.service postinst.sh prerm.sh skywire.install updates.sh test.sh" +echo "git add -f " *PKGBUILD " .SRCINFO skywire-autoconfig " *.desktop *.png *.service *.sh " skywire.install" echo 'git commit -m " "' |