diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 86 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 191 | ||||
| -rw-r--r-- | deb.PKGBUILD | 91 | ||||
| -rw-r--r-- | dev.PKGBUILD | 108 | ||||
| -rw-r--r-- | git.PKGBUILD | 74 | ||||
| -rw-r--r-- | skywire-scripts.tar.gz | bin | 11188 -> 24032 bytes | |||
| -rwxr-xr-x | test.sh | 12 | ||||
| -rwxr-xr-x | updates.sh | 36 |
9 files changed, 292 insertions, 318 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire pkgdesc = Skywire Mainnet Node implementation. Skycoin.com - pkgver = 0.6.0 - pkgrel = 5 + pkgver = 1.0.0 + pkgrel = 7 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -19,11 +19,9 @@ pkgbase = skywire makedepends = go makedepends = musl makedepends = kernel-headers-musl - source = https://github.com/skycoin/skywire/archive/refs/tags/v0.6.0.tar.gz - source = https://github.com/skycoin/skywire/raw/develop/dmsghttp-config.json + source = https://github.com/skycoin/skywire/archive/refs/tags/v1.0.0-rc7.tar.gz source = skywire-scripts.tar.gz - sha256sums = f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3 - sha256sums = dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49 - sha256sums = 791c5157f794248a67c3aba25084f1472f0422dd2cfaaa889da293c1de4c7c3f + sha256sums = 5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9 + sha256sums = fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08 pkgname = skywire @@ -6,26 +6,27 @@ _pkgname=${pkgname} _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" -pkgver=0.6.0 -pkgrel=5 -#pkgrel=5 +pkgver='1.0.0' +pkgrel=7 +#pkgrel=7 +_rc='-rc7' +_pkgver="${pkgver}${_rc}" +_tag_ver="v${_pkgver}" arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() -makedepends=('git' 'go' 'musl' 'kernel-headers-musl') #disable signature check pending fixes# 'skycoin-keyring') +makedepends=('git' 'go' 'musl' 'kernel-headers-musl') install=skywire.install _scripts=${_pkgname}-scripts -source=("${url}/archive/refs/tags/v${pkgver}.tar.gz" -"${url}/raw/develop/dmsghttp-config.json" +source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz" "${_scripts}.tar.gz" ) -sha256sums=('f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3' - 'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49' - '791c5157f794248a67c3aba25084f1472f0422dd2cfaaa889da293c1de4c7c3f') +sha256sums=('5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9' + 'fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08') prepare() { # https://wiki.archlinux.org/index.php/Go_package_guidelines mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps -ln -rTsf ${srcdir}/${pkgname}-${pkgver} ${srcdir}/go/src/${_pkggopath} +ln -rTsf ${srcdir}/${pkgname}-${pkgver}${_rc} ${srcdir}/go/src/${_pkggopath} cd ${srcdir}/go/src/${_pkggopath}/ } @@ -38,7 +39,7 @@ export CGO_ENABLED=1 #default anyways #use musl-gcc for static compilation export CC=musl-gcc -cd "${srcdir}/${pkgname}-${pkgver}" +cd ${srcdir}/${pkgname}-${pkgver}${_rc} local _version="v${pkgver}" DMSG_BASE="github.com/skycoin/dmsg" @@ -86,52 +87,47 @@ mkdir -p ${_pkgdir}/${_skydir}/bin mkdir -p ${_pkgdir}/${_skydir}/apps mkdir -p ${_pkgdir}/${_skydir}/local mkdir -p ${_pkgdir}/${_skydir}/scripts +mkdir -p ${_pkgdir}/${_systemddir} _msg2 'installing binaries' -_binaries=("${_pkgname}-cli" "${_pkgname}-visor") -for i in ${_binaries[@]}; do -_msg3 "${i}" - install -Dm755 ${GOBIN}/${i} ${_pkgdir}/${_skybin}/${i} - ln -rTsf ${_pkgdir}/${_skybin}/${i} ${_pkgdir}/usr/bin/${i} + install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/ +for _i in ${_pkgdir}/${_skybin}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done + _msg2 'installing app binaries' -_apps=${srcdir}/apps -_appbinaries=$( ls "${_GOAPPS}" ) -for i in ${_appbinaries}; do - _msg3 "${i}" - install -Dm755 ${_GOAPPS}/${i} ${_pkgdir}/${_skyapps}/${i} - ln -rTsf ${_pkgdir}/${_skyapps}/${i} ${_pkgdir}/usr/bin/${i} +_apps=${pkgdir}/test/apps +install -Dm755 ${_GOAPPS}/* ${_pkgdir}/${_skyapps}/ +for _i in ${_pkgdir}/${_skyapps}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing scripts' -_scripts1=${srcdir}/${_scripts}/${_pkgname} -_skywirescripts=$( ls ${_scripts1} ) -for i in ${_skywirescripts}; do - _install2 ${_scripts1}/${i} ${_skyscripts} +_msg2 'Installing scripts' +install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/* ${_pkgdir}/${_skyscripts}/ +for _i in ${_pkgdir}/${_skyscripts}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} - -install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json +_msg2 'Correcting symlink names' +ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} -#install the system.d services -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${pkgdir}/${_systemddir}/${_pkgname}-visor.service +#make sure everything is executable +chmod +x ${_pkgdir}/usr/bin/* -#desktop integration -install -Dm644 "${srcdir}"/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop -install -Dm644 "${srcdir}"/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png -mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png -} +_msg2 'installing dmsghttp-config.json' +install -Dm644 ${srcdir}/${_pkgname}*/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json +#install systemd services +_msg2 'Installing systemd services' +install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/ +rm ${_pkgdir}/${_systemddir}/skywire-hypervisor.service -_install2() { -_binname="${1##*/}" -_binname="${_binname%%.*}" -install -Dm755 ${1} ${pkgdir}/${2}/${_binname} -ln -rTsf ${pkgdir}/${2}/${_binname} ${pkgdir}/usr/bin/${_binname} -chmod +x ${pkgdir}/usr/bin/${_binname} +_msg2 'installing desktop files and icons' +mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywirevpn.SkywireVPN.desktop ${_pkgdir}/usr/share/applications/com.skywirevpn.SkywireVPN.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/skywirevpn.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywirevpn.png } _msg2() { diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index e83006e15437..0091959359ab 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -4,9 +4,13 @@ _pkgname=${pkgname} _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Debian package; cross-compile." _pkggopath="github.com/${_githuborg}/${_pkgname}" -pkgver=0.6.0 -pkgrel=5 -#pkgrel=5 +pkgver='1.0.0' +pkgrel=7 +#pkgrel=7 +_rc='-rc7' +_pkgver="${pkgver}${_rc}" +_tag_ver="v${_pkgver}" +_pkgrel=${pkgrel} arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() @@ -14,81 +18,77 @@ license=() _pkgarch=$(dpkg --print-architecture) _pkgarches=('armhf' 'arm64' 'amd64') arch=('any') -_pkgver=${_pkgver} -_pkgrel=${_pkgrel} makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') # 'arm-linux-gnueabihf-binutils' 'aarch64-binutils') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring') _debdeps="" install=skywire.install -_scripts="skywire-deb-scripts" -source=("${url}/archive/refs/tags/v${pkgver}.tar.gz" -"${url}/raw/develop/dmsghttp-config.json" +_scripts="skywire-scripts" +source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz" "${_scripts}.tar.gz" ) -sha256sums=('f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3' - 'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49' - '1ff213945f7c009572f71fdf00aea28c464996fbc4bf946b03c8787ac0cd47d9') +sha256sums=('5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9' + 'fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08') #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts #updpkgsums deb.PKGBUILD prepare() { - for i in ${_pkgarches[@]}; do - _msg2 "$i" +for i in ${_pkgarches[@]}; do +_msg2 "$i" done - # https://wiki.archlinux.org/index.php/Go_package_guidelines - mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarches[@]} ${srcdir}/go/apps.${_pkgarches[@]} - ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath} - cd ${srcdir}/go/src/${_pkggopath}/ +# https://wiki.archlinux.org/index.php/Go_package_guidelines +mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarches[@]} ${srcdir}/go/apps.${_pkgarches[@]} +ln -rTsf ${srcdir}/${pkgname}-${pkgver}${_rc} ${srcdir}/go/src/${_pkggopath} +cd ${srcdir}/go/src/${_pkggopath}/ } build() { - local GOPATH=${srcdir}/go - export GOOS=linux - export CGO_ENABLED=1 - - for i in ${_pkgarches[@]}; do - msg2 "_pkgarch=$i" - local _pkgarch=$i - export GOPATH=${srcdir}/go - export GOBIN=${GOPATH}/bin.${_pkgarch} - export _GOAPPS=${GOPATH}/apps.${_pkgarch} - export GOOS=linux - #static cross-compilation - [[ $_pkgarch == "amd64" ]] && export GOARCH=amd64 && export CC=musl-gcc - [[ $_pkgarch == "arm64" ]] && export GOARCH=arm64 && export CC=aarch64-linux-musl-gcc - [[ $_pkgarch == "armhf" ]] && export GOARCH=arm && export GOARM=6 && export CC=arm-linux-gnueabihf-musl-gcc - #_ldflags=('-linkmode external -extldflags "-static" -buildid=') - #create the skywire binaries - cd ${srcdir}/go/src/${_pkggopath} - _cmddir=${srcdir}/go/src/${_pkggopath}/cmd - - _buildbins skychat $_GOAPPS apps/ - _buildbins skysocks $_GOAPPS apps/ - _buildbins skysocks-client $_GOAPPS apps/ - _buildbins vpn-client $_GOAPPS apps/ - _buildbins vpn-server $_GOAPPS apps/ - _buildbins skywire-visor $GOBIN - _buildbins skywire-cli $GOBIN - _buildbins setup-node $GOBIN - - #binary transparency - cd $GOBIN - _msg2 'binary sha256sums' - echo -e "$_pkgarch" - sha256sum $(ls) - cd $_GOAPPS - sha256sum $(ls) - - _msg2 'creating the DEBIAN/control files' - #create control file for the debian package - echo "Package: skywire" > ${srcdir}/${_pkgarch}.control - echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/${_pkgarch}.control - echo "Priority: optional" >> ${srcdir}/${_pkgarch}.control - echo "Section: web" >> ${srcdir}/${_pkgarch}.control - echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.control - echo "Depends: ${_debdeps}" >> ${srcdir}/${_pkgarch}.control - echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.control - echo "Description: ${pkgdesc}" >> ${srcdir}/${_pkgarch}.control - done +local GOPATH=${srcdir}/go +export GOOS=linux +export CGO_ENABLED=1 + +for i in ${_pkgarches[@]}; do +msg2 "_pkgarch=$i" +local _pkgarch=$i +export GOPATH=${srcdir}/go +export GOBIN=${GOPATH}/bin.${_pkgarch} +export _GOAPPS=${GOPATH}/apps.${_pkgarch} +export GOOS=linux +#static cross-compilation +[[ $_pkgarch == "amd64" ]] && export GOARCH=amd64 && export CC=musl-gcc +[[ $_pkgarch == "arm64" ]] && export GOARCH=arm64 && export CC=aarch64-linux-musl-gcc +[[ $_pkgarch == "armhf" ]] && export GOARCH=arm && export GOARM=6 && export CC=arm-linux-gnueabihf-musl-gcc +#_ldflags=('-linkmode external -extldflags "-static" -buildid=') +#create the skywire binaries +cd ${srcdir}/go/src/${_pkggopath} +_cmddir=${srcdir}/go/src/${_pkggopath}/cmd + +_buildbins skychat $_GOAPPS apps/ +_buildbins skysocks $_GOAPPS apps/ +_buildbins skysocks-client $_GOAPPS apps/ +_buildbins vpn-client $_GOAPPS apps/ +_buildbins vpn-server $_GOAPPS apps/ +_buildbins skywire-visor $GOBIN +_buildbins skywire-cli $GOBIN +_buildbins setup-node $GOBIN + +#binary transparency +cd $GOBIN +_msg2 'binary sha256sums' +echo -e "$_pkgarch" +sha256sum $(ls) +cd $_GOAPPS +sha256sum $(ls) + +_msg2 'creating the DEBIAN/control files' +#create control file for the debian package +echo "Package: skywire" > ${srcdir}/${_pkgarch}.control +echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/${_pkgarch}.control +echo "Priority: optional" >> ${srcdir}/${_pkgarch}.control +echo "Section: web" >> ${srcdir}/${_pkgarch}.control +echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.control +echo "Depends: ${_debdeps}" >> ${srcdir}/${_pkgarch}.control +echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.control +echo "Description: ${pkgdesc}" >> ${srcdir}/${_pkgarch}.control + done } #had to speed up the build for testing - there's a risk of using old binaries. @@ -97,8 +97,8 @@ _GOHERE=$2 #target bin dir _binpath=$3 #find the binary here- expecting 'apps/' or empty _binname=$1 #which binary to build _msg2 "building ${_binname} binary" - cd ${_cmddir}/${_binpath}${_binname} - go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o ${_GOHERE}/${_binname} . +cd ${_cmddir}/${_binpath}${_binname} +go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o ${_GOHERE}/${_binname} . } @@ -106,9 +106,13 @@ package() { for i in ${_pkgarches[@]}; do msg2 "_pkgarch=${i}" local _pkgarch=${i} +GOPATH=${srcdir}/go +GOBIN=${GOPATH}/bin.${_pkgarch} +_GOAPPS=${GOPATH}/apps.${_pkgarch} + _msg2 'creating dirs' #set up to create a .deb package -_debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}" +_debpkgdir="${_pkgname}-${_pkgver}-${_pkgrel}-${_pkgarch}" _pkgdir="${pkgdir}/${_debpkgdir}" _skydir="opt/skywire" _skyapps="${_skydir}/apps" @@ -121,30 +125,25 @@ mkdir -p ${_pkgdir}/${_skydir}/bin mkdir -p ${_pkgdir}/${_skydir}/apps mkdir -p ${_pkgdir}/${_skydir}/local mkdir -p ${_pkgdir}/${_skydir}/scripts +mkdir -p ${_pkgdir}/${_systemddir} cd $_pkgdir - _msg2 'installing binaries' -#loop to install the binaries -_skywirebins=$( ls ${srcdir}/go/bin.${_pkgarch} ) -for i in ${_skywirebins}; do - _msg2 "$i" - _install2 ${srcdir}/go/bin.${_pkgarch}/${i} ${_skybin} + install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/ +for _i in ${_pkgdir}/${_skybin}/* ; do +ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing apps' -#loop to install the apps -_skywireapps=$( ls ${srcdir}/go/apps.${_pkgarch} ) -for i in ${_skywireapps}; do - _msg2 "$i" - _install2 ${srcdir}/go/apps.${_pkgarch}/${i} ${_skyapps} +_msg2 'installing app binaries' +install -Dm755 ${_GOAPPS}/* ${_pkgdir}/${_skyapps}/ +for _i in ${_pkgdir}/${_skyapps}/* ; do +ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing scripts' -_scripts1=${srcdir}/${_scripts}/${_pkgname} -_skywirescripts=$( ls "${_scripts1}" ) -for i in ${_skywirescripts}; do - _install2 ${_scripts1}/${i} ${_skyscripts} +_msg2 'Installing scripts' +install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/* ${_pkgdir}/${_skyscripts}/ +for _i in ${_pkgdir}/${_skyscripts}/* ; do +ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done _msg2 'Correcting symlink names' @@ -153,22 +152,18 @@ ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} #make sure everything is executable chmod +x ${_pkgdir}/usr/bin/* -#install dmsghttp-config.json -install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json +_msg2 'installing dmsghttp-config.json' +install -Dm644 ${srcdir}/${_pkgname}*/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json _msg2 'installing systemd services' -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service -#this is to overwrites any previous file not provided by this package -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}-hypervisor.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-autoconfig.service ${_pkgdir}/${_systemddir}/${_pkgname}-autoconfig.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-autoconfig-remote.service ${_pkgdir}/${_systemddir}/${_pkgname}-autoconfig-remote.service - -_msg2 'installing desktop files and icon' +install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/ + +_msg2 'installing desktop files and icons' +mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop -install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png -mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywirevpn.SkywireVPN.desktop ${_pkgdir}/usr/share/applications/com.skywirevpn.SkywireVPN.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/skywirevpn.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywirevpn.png _msg2 'installing control file and install scripts' install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control diff --git a/deb.PKGBUILD b/deb.PKGBUILD index 92d0751e6559..8b9f31f5f986 100644 --- a/deb.PKGBUILD +++ b/deb.PKGBUILD @@ -10,36 +10,31 @@ _pkgarch=$(dpkg --print-architecture) #leave arch package as any arch=('any') #manually version for now -pkgver='0.6.0' -_pkgver=${pkgver} -pkgrel=5 +pkgver='1.0.0' +pkgrel=7 +_rc='-rc7' +_pkgver="${pkgver}${_rc}" +_tag_ver="v${_pkgver}" _pkgrel=${pkgrel} -#pkgrel=5 _pkggopath="github.com/${_githuborg}/${_pkgname}" url="https://${_pkggopath}" license=() makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl') depends=() _debdeps="" -#_debdeps="reprepro" -_scripts="skywire-deb-scripts" -#source=("git+${url}.git#branch=${BRANCH:-develop}" -source=( "${url}/archive/refs/tags/v${pkgver}.tar.gz" -"${url}/raw/develop/dmsghttp-config.json" +_scripts="skywire-scripts" +source=( "${url}/archive/refs/tags/${_tag_ver}.tar.gz" "${_scripts}.tar.gz" ) -sha256sums=('f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3' - 'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49' - '1ff213945f7c009572f71fdf00aea28c464996fbc4bf946b03c8787ac0cd47d9') - -#tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts -#updpkgsums deb.PKGBUILD +sha256sums=('5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9' + 'fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08') prepare() { - # https://wiki.archlinux.org/index.php/Go_package_guidelines - mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarch} ${srcdir}/go/apps.${_pkgarch} - ln -rTsf ${srcdir}/${_pkgname}-${_pkgver} ${srcdir}/go/src/${_pkggopath} - ln -rTsf ${srcdir}/${_pkgname}-${_pkgver} ${srcdir}/${_pkgname} - cd ${srcdir}/go/src/${_pkggopath}/ + # https://wiki.archlinux.org/index.php/Go_package_guidelines +mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarch} ${srcdir}/go/apps.${_pkgarch} +[[ -d ${srcdir}/${pkgname} ]] && rm -rf ${srcdir}/${pkgname} + ln -rTsf ${srcdir}/${_pkgname}-${pkgver}${_rc} ${srcdir}/go/src/${_pkggopath} + ln -rTsf ${srcdir}/${_pkgname}-${pkgver}${_rc} ${srcdir}/${_pkgname} + cd ${srcdir}/go/src/${_pkggopath}/ } build() { @@ -88,15 +83,15 @@ _binpath=$3 #find the binary here- expecting 'apps/' or empty _binname=$1 #which binary to build _msg2 "building ${_binname} binary" if [[ ! -f ${_GOHERE}/${_binname} ]] ; then #don't waste time rebuilding existing bins - cd ${_cmddir}/${_binpath}${_binname} - go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ . +cd ${_cmddir}/${_binpath}${_binname} +go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ . fi } package() { _msg2 'creating dirs' #set up to create a .deb package -_debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}" +_debpkgdir="${_pkgname}-${pkgver}${_rc}-${_pkgrel}-${_pkgarch}" _pkgdir="${pkgdir}/${_debpkgdir}" _skydir="opt/skywire" _skyapps="${_skydir}/apps" @@ -104,47 +99,45 @@ _skyscripts="${_skydir}/scripts" _systemddir="etc/systemd/system" _skybin="${_skydir}/bin" mkdir -p ${_pkgdir}/usr/bin +mkdir -p ${_pkgdir}/${_skydir}/bin +mkdir -p ${_pkgdir}/${_skydir}/apps mkdir -p ${_pkgdir}/${_skydir}/local mkdir -p ${_pkgdir}/${_skydir}/scripts +mkdir -p ${_pkgdir}/${_systemddir} cd $_pkgdir - _msg2 'installing binaries' -#loop to install the binaries -_skywirebins=$( ls ${srcdir}/go/bin ) -for i in ${_skywirebins}; do - _msg2 "$i" - _install2 ${srcdir}/go/bin/${i} ${_skybin} +install -Dm755 ${srcdir}/go/bin/* ${_pkgdir}/${_skybin} +for _i in ${_pkgdir}/${_skybin}/*; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done _msg2 'installing apps' -#loop to install the apps -_skywireapps=$( ls ${srcdir}/go/apps ) -for i in ${_skywireapps}; do - _msg2 "$i" - _install2 ${srcdir}/go/apps/${i} ${_skyapps} +install -Dm755 ${srcdir}/go/apps/* ${_pkgdir}/${_skyapps} +for _i in ${_pkgdir}/${_skyapps}/*; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing scripts' -_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} ) -for i in ${_skywirescripts}; do - _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts} +_msg2 'Installing scripts' +install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/* ${_pkgdir}/${_skyscripts}/ +for _i in ${_pkgdir}/${_skyscripts}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} _msg2 'installing dmsghttp-config.json' -install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json +install -Dm644 ${srcdir}/${_pkgname}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json _msg2 'installing skywire systemd services' -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service +install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/ -_msg2 'installing desktop files and icon' +_msg2 'installing desktop files and icons' +mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop -install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png -mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywirevpn.SkywireVPN.desktop ${_pkgdir}/usr/share/applications/com.skywirevpn.SkywireVPN.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/skywirevpn.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywirevpn.png _msg2 'installing skywire control file, postinst & postrm scripts' install -Dm755 ${srcdir}/control ${_pkgdir}/DEBIAN/control @@ -160,14 +153,6 @@ mv *.deb ../../ exit } -_install2() { -_binname="${1##*/}" -_binname="${_binname%%.*}" -install -Dm755 ${1} ${_pkgdir}/${2}/${_binname} -ln -rTsf ${_pkgdir}/${2}/${_binname} ${_pkgdir}/usr/bin/${_binname} -chmod +x ${_pkgdir}/usr/bin/${_binname} -} - _msg2() { (( QUIET )) && return local mesg=$1; shift diff --git a/dev.PKGBUILD b/dev.PKGBUILD index 6d4243e9c39a..8ef4a98aedf4 100644 --- a/dev.PKGBUILD +++ b/dev.PKGBUILD @@ -7,8 +7,8 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation; develop branch - Debian package." _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='autogenerated' -pkgrel=5 -#pkgrel=5 +pkgrel=1 +#pkgrel=7 _pkgarch=$(dpkg --print-architecture) _pkgver=${pkgver} _pkgrel=${pkgrel} @@ -19,23 +19,22 @@ makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl') depends=() _debdeps="" install=skywire.install -_scripts="skywire-deb-scripts" -source=("git+${url}.git#branch=${BRANCH:-develop}" -"${url}/raw/develop/dmsghttp-config.json" +_scripts="skywire-scripts" +source=("git+${url}.git#branch=develop" "${_scripts}.tar.gz" ) sha256sums=('SKIP' - 'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49' - '1ff213945f7c009572f71fdf00aea28c464996fbc4bf946b03c8787ac0cd47d9') + 'fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08') #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts #updpkgsums deb.PKGBUILD pkgver() { -cd ${srcdir}/${_pkgname} -local _version=$(make version) +_version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) +_version=${_version##*/} _version=${_version%%-*} -echo ${_version//v/} +_version=${_version//v/} +echo ${_version} } prepare() { @@ -62,8 +61,6 @@ BUILDINFO=${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT} #create the skywire binaries cd ${srcdir}/go/src/${_pkggopath} -#git fetch -#git checkout develop _cmddir=${srcdir}/go/src/${_pkggopath}/cmd _msg2 "building skychat binary" @@ -113,37 +110,43 @@ echo "Description: ${pkgdesc}" >> ${srcdir}/control } package() { - #set up to create a .deb package - _debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}" - _pkgdir="${pkgdir}/${_debpkgdir}" - _skydir="opt/skywire" - _skyapps="${_skydir}/apps" - _skyscripts="${_skydir}/scripts" - _systemddir="etc/systemd/system" - _skybin="${_skydir}/bin" - mkdir -p ${_pkgdir}/usr/bin - mkdir -p ${_pkgdir}/${_skydir}/bin - mkdir -p ${_pkgdir}/${_skydir}/apps - mkdir -p ${_pkgdir}/${_skydir}/local - mkdir -p ${_pkgdir}/${_skydir}/scripts - - cd $_pkgdir +#set up to create a .deb package +_debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}" +_pkgdir="${pkgdir}/${_debpkgdir}" +_skydir="opt/skywire" +_skyapps="${_skydir}/apps" +_skyscripts="${_skydir}/scripts" +_systemddir="etc/systemd/system" +_skybin="${_skydir}/bin" +mkdir -p ${_pkgdir}/usr/bin +mkdir -p ${_pkgdir}/${_skydir}/bin +mkdir -p ${_pkgdir}/${_skydir}/apps +mkdir -p ${_pkgdir}/${_skydir}/local +mkdir -p ${_pkgdir}/${_skydir}/scripts +mkdir -p ${_pkgdir}/${_systemddir} + + +cd $_pkgdir _msg2 'installing binaries' -_skywirebins=$( ls ${srcdir}/go/bin ) -for i in ${_skywirebins}; do - _install2 ${srcdir}/go/bin/${i} ${_skybin} + install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/ +for _i in ${_pkgdir}/${_skybin}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing apps' -_skywireapps=$( ls ${srcdir}/go/apps ) -for i in ${_skywireapps}; do - _install2 ${srcdir}/go/apps/${i} ${_skyapps} + +_msg2 'installing app binaries' +_apps=${pkgdir}/test/apps +install -Dm755 ${_GOAPPS}/* ${_pkgdir}/${_skyapps}/ +for _i in ${_pkgdir}/${_skyapps}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing scripts' -_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} ) -for i in ${_skywirescripts}; do - _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts} + +_msg2 'Installing scripts' +install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/* ${_pkgdir}/${_skyscripts}/ +for _i in ${_pkgdir}/${_skyscripts}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done + chmod +x ${_pkgdir}/usr/bin/* #rename visor to skywire - matche the skycoin / skycoin-cli of the skycoin wallet [[ -f ${_pkgdir}/usr/bin/${_pkgname}-visor ]] && ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} @@ -152,24 +155,14 @@ _msg2 'installing dmsghttp-config.json' install -Dm644 ${srcdir}/${_pkgname}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json _msg2 'installing skywire systemd services' -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service +install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/ -_msg2 'installing desktop files and icon' +_msg2 'installing desktop files and icons' +mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop -install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png -mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png -###STAGING AREA### -#Install the correct autocofig script -rm ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig -install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/.${_pkgname}-autoconfig-git.sh ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig -ln -rTsf ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig ${_pkgdir}/usr/bin/${_pkgname}-autoconfig -#Install the updated systemd services -install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service -install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-user.service ${_pkgdir}/${_systemddir}/${_pkgname}-user.service - +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywirevpn.SkywireVPN.desktop ${_pkgdir}/usr/share/applications/com.skywirevpn.SkywireVPN.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/skywirevpn.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywirevpn.png _msg2 'installing skywire control file, postinst & postrm scripts' install -Dm755 ${srcdir}/control ${_pkgdir}/DEBIAN/control install -Dm755 ${srcdir}/${_scripts}/postinst.sh ${_pkgdir}/DEBIAN/postinst @@ -184,13 +177,6 @@ mv *.deb ../../ exit } -_install2() { -_binname="${1##*/}" -_binname="${_binname%%.*}" -install -Dm755 ${1} ${_pkgdir}/${2}/${_binname} -ln -rTsf ${_pkgdir}/${2}/${_binname} ${_pkgdir}/usr/bin/${_binname} -} - _msg2() { (( QUIET )) && return local mesg=$1; shift diff --git a/git.PKGBUILD b/git.PKGBUILD index 98d69fbe4c69..54e94d925d7a 100644 --- a/git.PKGBUILD +++ b/git.PKGBUILD @@ -7,27 +7,26 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='autogenerated' -pkgrel=5 -#pkgrel=5 +pkgrel=1 +#pkgrel=7 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() makedepends=('git' 'go' 'musl' 'kernel-headers-musl') install=skywire.install _scripts=${_pkgname}-scripts -source=("git+${url}.git#branch=${BRANCH:-develop}" -"${url}/raw/develop/dmsghttp-config.json" +source=("git+${url}.git#branch=develop" "${_scripts}.tar.gz" ) sha256sums=('SKIP' - 'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49' - '791c5157f794248a67c3aba25084f1472f0422dd2cfaaa889da293c1de4c7c3f') + 'fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08') pkgver() { -cd ${srcdir}/${_pkgname} -local _version=$(make version) +_version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) +_version=${_version##*/} _version=${_version%%-*} -echo ${_version//v/} +_version=${_version//v/} +echo ${_version} } prepare() { @@ -54,8 +53,6 @@ BUILDINFO=${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT} #create the skywire binaries cd ${srcdir}/go/src/${_pkggopath} -#git fetch -#git checkout develop _cmddir=${srcdir}/go/src/${_pkggopath}/cmd _msg2 "building skychat binary" @@ -106,22 +103,27 @@ mkdir -p ${_pkgdir}/${_skydir}/bin mkdir -p ${_pkgdir}/${_skydir}/apps mkdir -p ${_pkgdir}/${_skydir}/local mkdir -p ${_pkgdir}/${_skydir}/scripts +mkdir -p ${_pkgdir}/${_systemddir} _msg2 'installing binaries' -_skywirebins=$( ls ${srcdir}/go/bin ) -for i in ${_skywirebins}; do - _install2 ${srcdir}/go/bin/${i} ${_skybin} + install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/ +for _i in ${_pkgdir}/${_skybin}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing apps' -_skywireapps=$( ls ${srcdir}/go/apps ) -for i in ${_skywireapps}; do - _install2 ${srcdir}/go/apps/${i} ${_skyapps} + +_msg2 'installing app binaries' +_apps=${pkgdir}/test/apps +install -Dm755 ${_GOAPPS}/* ${_pkgdir}/${_skyapps}/ +for _i in ${_pkgdir}/${_skyapps}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done -_msg2 'installing scripts' -_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} ) -for i in ${_skywirescripts}; do - _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts} + +_msg2 'Installing scripts' +install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/* ${_pkgdir}/${_skyscripts}/ +for _i in ${_pkgdir}/${_skyscripts}/* ; do + ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} done + chmod +x ${_pkgdir}/usr/bin/* #rename visor to skywire - matche the skycoin / skycoin-cli of the skycoin wallet [[ -f ${_pkgdir}/usr/bin/${_pkgname}-visor ]] && ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} @@ -130,30 +132,14 @@ _msg2 'installing dmsghttp-config.json' install -Dm644 ${srcdir}/${_pkgname}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json _msg2 'installing skywire systemd services' -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service +install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/ -_msg2 'installing desktop files and icon' +_msg2 'installing desktop files and icons' +mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop -install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png -mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png -###STAGING AREA### -#Install the correct autocofig script -rm ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig -install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/.${_pkgname}-autoconfig-git.sh ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig -ln -rTsf ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig ${_pkgdir}/usr/bin/${_pkgname}-autoconfig -#Install the updated systemd services -install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service -install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service -install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-user.service ${_pkgdir}/${_systemddir}/${_pkgname}-user.service -} - -_install2() { -_binname="${1##*/}" -_binname="${_binname%%.*}" -install -Dm755 ${1} ${_pkgdir}/${2}/${_binname} -ln -rTsf ${_pkgdir}/${2}/${_binname} ${_pkgdir}/usr/bin/${_binname} +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywirevpn.SkywireVPN.desktop ${_pkgdir}/usr/share/applications/com.skywirevpn.SkywireVPN.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png +install -Dm644 ${srcdir}/${_scripts}/desktop/skywirevpn.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywirevpn.png } _msg2() { diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz Binary files differindex 144115a9e991..9d04207d7757 100644 --- a/skywire-scripts.tar.gz +++ b/skywire-scripts.tar.gz diff --git a/test.sh b/test.sh new file mode 100755 index 000000000000..a2d7d93cecab --- /dev/null +++ b/test.sh @@ -0,0 +1,12 @@ +#!/bin/bash +clear +echo -e "makepkg -fp PKGBUILD" +makepkg -Cfp PKGBUILD +echo -e "makepkg -fp git.PKGBUILD" +makepkg -Cfp git.PKGBUILD +echo -e "makepkg -fp deb.PKGBUILD" +makepkg -Cfp deb.PKGBUILD +echo -e "makepkg -fp dev.PKGBUILD" +makepkg -Cfp dev.PKGBUILD +echo -e "makepkg -fp cc.deb.PKGBUILD" +makepkg -Cfp cc.deb.PKGBUILD diff --git a/updates.sh b/updates.sh index 1b6bb726589e..391e29cd4bac 100755 --- a/updates.sh +++ b/updates.sh @@ -1,13 +1,29 @@ #!/bin/bash #re-archive the scripts and update the checksums, etc. -[[ -d skywire-deb-scripts ]] && tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts -[[ -d skywire-scripts ]] && tar -czvf skywire-scripts.tar.gz skywire-scripts -[[ -f cc.deb.PKGBUILD ]] && updpkgsums cc.deb.PKGBUILD && _ccdebPKGBUILD="cc.deb.PKGBUILD" -[[ -f deb.PKGBUILD ]] && updpkgsums deb.PKGBUILD && _debPKGBUILD="deb.PKGBUILD" -[[ -f dev.PKGBUILD ]] && sed -i "s/pkgver=0.6.0/pkgver='autogenerated'/" dev.PKGBUILD && updpkgsums dev.PKGBUILD && _devPKGBUILD="dev.PKGBUILD" -[[ -f git.PKGBUILD ]] && sed -i "s/pkgver=0.6.0/pkgver='autogenerated'/" git.PKGBUILD && updpkgsums git.PKGBUILD && _gitPKGBUILD="git.PKGBUILD" - -updpkgsums +tar -czvf skywire-scripts.tar.gz skywire-scripts +#reset the pkgver to autogenerated +_version=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1) +_version=${_version##*/} +_version=${_version%%-*} +_version=${_version//v/} +_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 +echo ${_version} +echo ${_vrc} +echo "updatng checksums and version for PKGBUILD" +sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD && updpkgsums +echo "updatng checksums and version for cc.deb.PKGBUILD" +[[ -f 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" +echo "updatng checksums and version for deb.PKGBUILD" +[[ -f deb.PKGBUILD ]] && sed -i "s/^pkgver=.*/pkgver='${_version}'/" deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" deb.PKGBUILD && updpkgsums deb.PKGBUILD && _debPKGBUILD="deb.PKGBUILD" +echo "updatng checksums and version for dev.PKGBUILD" +[[ -f dev.PKGBUILD ]] && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" dev.PKGBUILD && updpkgsums dev.PKGBUILD && _devPKGBUILD="dev.PKGBUILD" +echo "updatng checksums and version for git.PKGBUILD" +[[ -f git.PKGBUILD ]] && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" git.PKGBUILD && updpkgsums git.PKGBUILD && _gitPKGBUILD="git.PKGBUILD" +echo "creating .SRCINFO" makepkg --printsrcinfo > .SRCINFO -echo "git add -f ${_debPKGBUILD} ${_ccdebPKGBUILD} ${_devPKGBUILD} ${_gitPKGBUILD} PKGBUILD .SRCINFO skywire-scripts.tar.gz skywire-deb-scripts.tar.gz updates.sh" -echo 'git commit -m ""' +echo "don't forget to increment pkgrel if you edited the PKGBUILD" +echo "git add -f ${_debPKGBUILD} ${_ccdebPKGBUILD} ${_devPKGBUILD} ${_gitPKGBUILD} PKGBUILD .SRCINFO skywire-scripts.tar.gz updates.sh test.sh" +echo 'git commit -m " "' |