diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 90 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 111 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 132 | ||||
| -rwxr-xr-x | updates.sh | 12 |
5 files changed, 142 insertions, 207 deletions
@@ -18,9 +18,7 @@ pkgbase = skywire-bin license = license-free provides = skywire conflicts = skywire - backup = opt/skywire/users.db - backup = opt/skywire/skywire.json - backup = opt/skywire/local + backup = opt/skywire/{users.db,skywire.json,local} source = skywire-autoconfig source = skywire.desktop source = skywirevpn.desktop @@ -16,8 +16,8 @@ provides=( 'skywire' ) conflicts=( 'skywire' ) license=('license-free') install=skywire.install -backup=(opt/${_pkgname}/{users.db,skywire.json,local}) -source=("skywire-autoconfig" +backup=("opt/${_pkgname}/{users.db,skywire.json,local}") +_source=("skywire-autoconfig" "skywire.desktop" "skywirevpn.desktop" "skywirevpn.png" @@ -25,6 +25,7 @@ source=("skywire-autoconfig" "skywire.service" "skywire-autoconfig.service" ) +source=("${_source[@]}") sha256sums=('08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' @@ -39,73 +40,68 @@ sha256sums_armv7=('6619e736efc1823517a98f31ec9611d4211674d1b70b17e25c5ae1cfeab55 sha256sums_armv7l=('6619e736efc1823517a98f31ec9611d4211674d1b70b17e25c5ae1cfeab556f1') sha256sums_armv7h=('6619e736efc1823517a98f31ec9611d4211674d1b70b17e25c5ae1cfeab556f1') sha256sums_arm=('a66bdfa7ffe83cc770a7955e2aedeccaeef43d71e5597005e063058eba004fe8') -#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 -#https://github.com/skycoin/skywire/releases/download/v1.0.0/skywire-v1.0.0-linux-arm.tar.gz +#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 +#https://github.com/skycoin/skywire/releases/download/v1.2.1/skywire-v1.2.1-linux-arm.tar.gz _binarchive=("${_pkgname}-${_tag_ver}-linux") _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}") source_x86_64=("${_release_url}-amd64.tar.gz") source_aarch64=("${_release_url}-arm64.tar.gz") -source_armv8=( ${source_aarch64[@]} ) +source_armv8=( "${source_aarch64[@]}" ) source_arm=("${_release_url}-arm.tar.gz") source_armv7=("${_release_url}-armhf.tar.gz") -source_armv7l=( ${source_armv7[@]} ) -source_armv7h=( ${source_armv7[@]} ) +source_armv7l=( "${source_armv7[@]}" ) +source_armv7h=( "${source_armv7[@]}" ) +_binaries=("skywire-cli" "skywire-visor") package() { -_msg2 'Creating dirs' +GOBIN="${srcdir}/" +_GOAPPS="${GOBIN}/apps" +#declare the _pkgdir and systemd directory _pkgdir="${pkgdir}" +_systemddir="usr/lib/systemd/system" +_package +} +#_package function - used in build variants +_package() { _skydir="opt/skywire" _skyapps="${_skydir}/apps" -_skyscripts="${_skydir}/scripts" -_systemddir="usr/lib/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} - +_skyscripts="${_skydir}/scripts" +_msg2 'creating dirs' +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}" _msg2 'installing binaries' - install -Dm755 ${srcdir}/${_pkgname}-cli ${_pkgdir}/${_skybin}/ - install -Dm755 ${srcdir}/${_pkgname}-visor ${_pkgdir}/${_skybin}/ -for _i in ${_pkgdir}/${_skybin}/* ; do - ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} -done - +for _i in "${_binaries[@]}" ; do + install -Dm755 "${GOBIN}/${_i}" "${_pkgdir}/${_skybin}/" + ln -rTsf "${_pkgdir}/${_skybin}/${_i}" "${_pkgdir}/usr/bin/${_i}" + done _msg2 'installing app binaries' -_apps=${srcdir}/apps -install -Dm755 ${_apps}/* ${_pkgdir}/${_skyapps}/ -for _i in ${_pkgdir}/${_skyapps}/* ; do - ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} +install -Dm755 "${_GOAPPS}/"* "${_pkgdir}/${_skyapps}/" +for _i in "${_pkgdir}/${_skyapps}/"* ; do + ln -rTsf "${_i}" "${_pkgdir}/usr/bin/${_i##*/}" done - _msg2 'Installing scripts' -install -Dm755 ${srcdir}/skywire-autoconfig ${_pkgdir}/${_skyscripts}/ -for _i in ${_pkgdir}/${_skyscripts}/* ; do - ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} -done - +install -Dm755 "${srcdir}/skywire-autoconfig" "${_pkgdir}/${_skyscripts}/" +ln -rTsf "${_pkgdir}/${_skyscripts}/skywire-autoconfig" "${_pkgdir}/usr/bin/skywire-autoconfig" _msg2 'Correcting symlink names' -ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} - -#make sure everything is executable -chmod +x ${_pkgdir}/usr/bin/* - +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}/dmsghttp-config.json" "${_pkgdir}/${_skydir}/dmsghttp-config.json" _msg2 'Installing systemd services' -install -Dm644 ${srcdir}/*service ${_pkgdir}/${_systemddir}/ - +install -Dm644 "${srcdir}/"*.service "${_pkgdir}/${_systemddir}/" _msg2 'installing desktop files and icons' -mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -install -Dm644 ${srcdir}/*.desktop ${_pkgdir}/usr/share/applications/ -install -Dm644 ${srcdir}/*.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ +mkdir -p "${_pkgdir}/usr/share/applications/" "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/" +install -Dm644 "${srcdir}/"*.desktop "${_pkgdir}/usr/share/applications/" +install -Dm644 "${srcdir}/"*.png "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/" } + _msg2() { (( QUIET )) && return local mesg=$1; shift diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index 6955dcdec6e9..797077c224bc 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -11,18 +11,11 @@ makedepends=('dpkg') _debdeps="" _binarchive=("${_pkgname}-${_tag_ver}-linux") _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}") -source=( +source=("${_source[@]}" "${_release_url}-amd64.tar.gz" "${_release_url}-arm64.tar.gz" "${_release_url}-armhf.tar.gz" "${_release_url}-arm.tar.gz" -"skywire-autoconfig" -"skywire.desktop" -"skywirevpn.desktop" -"skywirevpn.png" -"skywire.png" -"skywire.service" -"skywire-autoconfig.service" "postinst.sh" "prerm.sh" ) @@ -32,17 +25,17 @@ noextract=( "${_binarchive}armhf.tar.gz" "${_release_url}-arm.tar.gz" ) -sha256sums=('d2dd1f6a15eba62cad2838602e8366bb8fe63cf2df00e9f1619a8233e8d20235' - '60da7b30dc42b43e469caa5e82d9f2e9413a65a54a15007cf44725cdc334d209' - '6619e736efc1823517a98f31ec9611d4211674d1b70b17e25c5ae1cfeab556f1' - 'a66bdfa7ffe83cc770a7955e2aedeccaeef43d71e5597005e063058eba004fe8' - '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' +sha256sums=('08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18' '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c' + 'd2dd1f6a15eba62cad2838602e8366bb8fe63cf2df00e9f1619a8233e8d20235' + '60da7b30dc42b43e469caa5e82d9f2e9413a65a54a15007cf44725cdc334d209' + '6619e736efc1823517a98f31ec9611d4211674d1b70b17e25c5ae1cfeab556f1' + 'a66bdfa7ffe83cc770a7955e2aedeccaeef43d71e5597005e063058eba004fe8' '7b17a55e64d1371fecd24edc3da7c6a762cf2b3d058f6fc4a5dc7c5f9b4cff09' '233ccf0e87b37e782828f53960e05e478cf381f61bbfdb16a0cc0254ee8be7c2') @@ -65,88 +58,56 @@ 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}" -local _pkgarch=${i} -local _pkgarch1=${_pkgarch} +for _i in "${_pkgarches[@]}"; do +_msg2 "_pkgarch=${_i}" +local _pkgarch="${_i}" +local _pkgarch1="${_pkgarch}" if [[ ${_pkgarch} == "armel" || ${_pkgarch} == "armhf" ]] ; then local _pkgarch1=arm fi local _binaryarchive="${_pkgname}-${_tag_ver}-linux-${_pkgarch1}.tar.gz" -[[ -f ${srcdir}/${_pkgname}-visor ]] && rm -rf ${srcdir}/${_pkgname}-visor -[[ -f ${srcdir}/${_pkgname}-cli ]] && rm -rf ${srcdir}/${_pkgname}-cli -[[ -d ${srcdir}/apps ]] && rm -rf ${srcdir}/apps +[[ -f "${srcdir}/${_pkgname}-visor" ]] && rm -rf "${srcdir}/${_pkgname}-visor" +[[ -f "${srcdir}/${_pkgname}-cli" ]] && rm -rf "${srcdir}/${_pkgname}-cli" +[[ -d "${srcdir}/apps" ]] && rm -rf "${srcdir}/apps" [[ -d ${pkgdir}/test ]] && rm -rf ${pkgdir}/test -mkdir -p ${pkgdir}/test && cd ${pkgdir}/test -tar -xf ${srcdir}/${_binaryarchive} +mkdir -p "${pkgdir}/test" && cd "${pkgdir}/test" +tar -xf "${srcdir}/${_binaryarchive}" -_msg2 'creating dirs' +GOBIN="${pkgdir}/test" +_GOAPPS="${GOBIN}/apps" #set up to create a .deb package _debpkgdir="${pkgname}-${pkgver}-${pkgrel}-${_pkgarch}" _pkgdir="${pkgdir}/${_debpkgdir}" +[[ -d "${_pkgdir}" ]] && rm -rf "${_pkgdir}" -_skydir="opt/skywire" -_skyapps="${_skydir}/apps" -_skyscripts="${_skydir}/scripts" +#declare the _pkgdir and systemd directory _systemddir="etc/systemd/system" -_skybin="${_skydir}/bin" -[[ -d ${_pkgdir} ]] && rm -rf ${_pkgdir} -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' - install -Dm755 ${pkgdir}/test/${_pkgname}-cli ${_pkgdir}/${_skybin}/ - install -Dm755 ${pkgdir}/test/${_pkgname}-visor ${_pkgdir}/${_skybin}/ -for _i in ${_pkgdir}/${_skybin}/* ; do - ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} -done - -_msg2 'installing app binaries' -_apps=${pkgdir}/test/apps -install -Dm755 ${_apps}/* ${_pkgdir}/${_skyapps}/ -for _i in ${_pkgdir}/${_skyapps}/* ; do - ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/} -done - -_msg2 'Installing scripts' -install -Dm755 ${srcdir}/skywire-autoconfig ${_pkgdir}/${_skyscripts}/ -ln -rTsf ${_pkgdir}/${_skyscripts}/skywire-autoconfig ${_pkgdir}/usr/bin/skywire-autoconfig - -_msg2 'Correcting symlink names' -ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} - -#make sure everything is executable -chmod +x ${_pkgdir}/usr/bin/* - -_msg2 'installing dmsghttp-config.json' -install -Dm644 ${pkgdir}/test/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json - -_msg2 'installing systemd services' -install -Dm644 ${srcdir}/*.service ${_pkgdir}/${_systemddir}/ -_msg2 'installing desktop files and icons' -mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -install -Dm644 ${srcdir}/*.desktop ${_pkgdir}/usr/share/applications/ -install -Dm644 ${srcdir}/*.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ +_package _msg2 'installing control file and install scripts' -install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control +install -Dm755 "${srcdir}/${_pkgarch}.control" "${_pkgdir}/DEBIAN/control" #install -Dm755 ${srcdir}/${_scripts}/preinst.sh ${_pkgdir}/DEBIAN/preinst -install -Dm755 ${srcdir}/postinst.sh ${_pkgdir}/DEBIAN/postinst -install -Dm755 ${srcdir}/prerm.sh ${_pkgdir}/DEBIAN/prerm -#install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm +install -Dm755 "${srcdir}/postinst.sh" "${_pkgdir}/DEBIAN/postinst" +install -Dm755 "${srcdir}/prerm.sh" "${_pkgdir}/DEBIAN/prerm" +#install -Dm755 "${srcdir}/${_scripts}/postrm.sh" "${_pkgdir}/DEBIAN/postrm" _msg2 'creating the debian package' #create the debian package! -cd $pkgdir -dpkg-deb --build -z9 ${_debpkgdir} +cd "${pkgdir}" +dpkg-deb --build -z9 "${_debpkgdir}" mv *.deb ../../ done #exit so the arch package doesn't get built diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index 383a11f3f5de..5f607af35555 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -7,18 +7,11 @@ _pkgarch=$(dpkg --print-architecture) _pkgarches=('armhf' 'arm64' 'amd64' 'armel') arch=( 'any' ) license=('license-free') +#note some makedeps are failing to build for me currently. Debian cross-compilation needs static binaries to work. makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') _debdeps="" source=("git+${url}.git#branch=develop" -"skywire-autoconfig" -"skywire.desktop" -"skywirevpn.desktop" -"skywirevpn.png" -"skywire.png" -"skywire.service" -"skywire-autoconfig.service" -"postinst.sh" -"prerm.sh" +"${_source[@]}" ) sha256sums=('SKIP' '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316' @@ -27,9 +20,7 @@ sha256sums=('SKIP' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' 'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495' '19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18' - '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c' - '7b17a55e64d1371fecd24edc3da7c6a762cf2b3d058f6fc4a5dc7c5f9b4cff09' - '233ccf0e87b37e782828f53960e05e478cf381f61bbfdb16a0cc0254ee8be7c2') + '55293e05c5d6c877397eb4c52123bb02e8bc92aeaf663ba70e1cfab318ce727c') pkgver() { _version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) @@ -40,21 +31,21 @@ echo ${_version} } prepare() { -for _i in ${_pkgarches[@]}; do +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}/ -for _i in ${_pkgarches[@]}; do -mkdir -p ${srcdir}/go/bin.${_i} -mkdir -p ${srcdir}/go/apps.${_i} +mkdir -p "${srcdir}/go/src/github.com/${_githuborg}/" +for _i in "${_pkgarches[@]}"; do +mkdir -p "${srcdir}/go/bin.${_i}" +mkdir -p "${srcdir}/go/apps.${_i}" done -ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath} -cd ${srcdir}/go/src/${_pkggopath}/ +ln -rTsf "${srcdir}/${_pkgname}" "${srcdir}/go/src/${_pkggopath}" +cd "${srcdir}/go/src/${_pkggopath}/" } build() { -export GOPATH=${srcdir}/go +export GOPATH="${srcdir}/go" export GOOS=linux export CGO_ENABLED=1 #default anyways @@ -64,11 +55,11 @@ BUILDINFO_PATH="${DMSG_BASE}/buildinfo" BUILDINFO_VERSION="${BUILDINFO_PATH}.version=${_version}" BUILDINFO=${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT} #use musl-gcc for static compilation -for _i in ${_pkgarches[@]}; do +for _i in "${_pkgarches[@]}"; do msg2 "_pkgarch=$_i" local _pkgarch=$_i -export GOBIN=${GOPATH}/bin.${_pkgarch} -export _GOAPPS=${GOPATH}/apps.${_pkgarch} +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 @@ -76,11 +67,9 @@ export GOOS=linux [[ $_pkgarch == "armhf" ]] && export GOARCH=arm && export GOARM=6 && export CC=arm-linux-gnueabihf-musl-gcc [[ $_pkgarch == "armel" ]] && export GOARCH=arm && export GOARM=5 && export CC=arm-linux-gnueabihf-musl-gcc #_ldflags=('-linkmode external -extldflags "-static" -buildid=') -#create the skywire binaries - #create the skywire binaries -cd ${srcdir}/go/src/${_pkggopath} +cd "${srcdir}/go/src/${_pkggopath}" _msg2 "git branch:" git branch _msg2 "version:" @@ -88,31 +77,30 @@ make version _msg2 "commit:" make commit -_cmddir=${srcdir}/go/src/${_pkggopath}/cmd - +_cmddir="${srcdir}/go/src/${_pkggopath}/cmd" _msg2 "building skychat binary" -cd ${_cmddir}/apps/skychat +cd "${_cmddir}/apps/skychat" go build -trimpath --ldflags="" --ldflags "-s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . _msg2 "building skysocks binary" -cd ${_cmddir}/apps/skysocks +cd "${_cmddir}/apps/skysocks" go build -trimpath --ldflags="" --ldflags "-s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . _msg2 "building skysocks-client binary" -cd ${_cmddir}/apps/skysocks-client +cd "${_cmddir}/apps/skysocks-client" go build -trimpath --ldflags="" --ldflags " -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . _msg2 "building vpn-client binary" -cd ${_cmddir}/apps/vpn-client +cd "${_cmddir}/apps/vpn-client" go build -trimpath --ldflags="" --ldflags "-s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . _msg2 "building vpn-server binary" -cd ${_cmddir}/apps/vpn-server +cd "${_cmddir}/apps/vpn-server" go build -trimpath --ldflags="" --ldflags "-s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . _msg2 "building skywire-cli binary" -cd ${_cmddir}/skywire-cli +cd "${_cmddir}/skywire-cli" go build -trimpath --ldflags="" --ldflags "-s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN . _msg2 "building skywire-visor binary" -cd ${_cmddir}/skywire-visor +cd "${_cmddir}/skywire-visor" go build -trimpath --ldflags="" --ldflags "-s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN . _msg2 "building setup-node binary" -cd ${_cmddir}/setup-node +cd "${_cmddir}/setup-node" go build -trimpath --ldflags="" --ldflags " -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN . #binary transparency @@ -138,12 +126,12 @@ echo "Description: ${pkgdesc}" >> ${srcdir}/${_pkgarch}.control } package() { -for _i in ${_pkgarches[@]}; do +for _i in "${_pkgarches[@]}"; do msg2 "_pkgarch=${_i}" local _pkgarch=${_i} -GOPATH=${srcdir}/go -GOBIN=${GOPATH}/bin.${_pkgarch} -_GOAPPS=${GOPATH}/apps.${_pkgarch} +GOPATH="${srcdir}/go" +GOBIN="${GOPATH}/bin.${_pkgarch}" +_GOAPPS="${GOPATH}/apps.${_pkgarch}" _msg2 'creating dirs' #set up to create a .deb package _debpkgdir="${_pkgname}-bin-${pkgver}-${_pkgrel}-${_pkgarch}" @@ -153,61 +141,61 @@ _skyapps="${_skydir}/apps" _skyscripts="${_skydir}/scripts" _systemddir="etc/systemd/system" _skybin="${_skydir}/bin" -[[ -d ${_pkgdir} ]] && rm -rf ${_pkgdir} -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 +[[ -d "${_pkgdir}" ]] && rm -rf "${_pkgdir}" +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' - install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/ -for _j in ${_pkgdir}/${_skybin}/* ; do - ln -rTsf ${_j} ${_pkgdir}/usr/bin/${_j##*/} + install -Dm755 "${GOBIN}/"* "${_pkgdir}/${_skybin}/" +for _j in "${_pkgdir}/${_skybin}/"* ; do + ln -rTsf "${_j}" "${_pkgdir}/usr/bin/${_j##*/}" done _msg2 'installing app binaries' -_apps=${pkgdir}/test/apps -install -Dm755 ${_GOAPPS}/* ${_pkgdir}/${_skyapps}/ -for _j in ${_pkgdir}/${_skyapps}/* ; do - ln -rTsf ${_j} ${_pkgdir}/usr/bin/${_j##*/} +_apps="${pkgdir}/test/apps" +install -Dm755 "${_GOAPPS}/"* "${_pkgdir}/${_skyapps}/" +for _j in "${_pkgdir}/${_skyapps}/"* ; do + ln -rTsf "${_j}" "${_pkgdir}/usr/bin/${_j##*/}" done _msg2 'Installing scripts' -install -Dm755 ${srcdir}/skywire-autoconfig ${_pkgdir}/${_skyscripts}/ -ln -rTsf ${_pkgdir}/${_skyscripts}/skywire-autoconfig ${_pkgdir}/usr/bin/skywire-autoconfig +install -Dm755 "${srcdir}/skywire-autoconfig" "${_pkgdir}/${_skyscripts}/" +ln -rTsf "${_pkgdir}/${_skyscripts}/skywire-autoconfig" "${_pkgdir}/usr/bin/skywire-autoconfig" _msg2 'Correcting symlink names' -ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} +ln -rTsf "${_pkgdir}/${_skybin}/${_pkgname}-visor" "${_pkgdir}/usr/bin/${_pkgname}" #make sure everything is executable -chmod +x ${_pkgdir}/usr/bin/* +chmod +x "${_pkgdir}/usr/bin/"* _msg2 'installing dmsghttp-config.json' -install -Dm644 ${srcdir}/${_pkgname}/dmsghttp-config.json ${_pkgdir}/${_skydir}/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}/*.service ${_pkgdir}/${_systemddir}/ +install -Dm644 "${srcdir}/"*.service "${_pkgdir}/${_systemddir}/" _msg2 'installing desktop files and icons' -mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ -install -Dm644 ${srcdir}/*.desktop ${_pkgdir}/usr/share/applications/ -install -Dm644 ${srcdir}/*.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ +mkdir -p "${_pkgdir}/usr/share/applications/" "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/" +install -Dm644 "${srcdir}/"*.desktop "${_pkgdir}/usr/share/applications/" +install -Dm644 "${srcdir}/"*.png "${_pkgdir}/usr/share/icons/hicolor/48x48/apps/" _msg2 'installing control file and install scripts' -install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control -#install -Dm755 ${srcdir}/${_scripts}/preinst.sh ${_pkgdir}/DEBIAN/preinst -install -Dm755 ${srcdir}/postinst.sh ${_pkgdir}/DEBIAN/postinst -install -Dm755 ${srcdir}/prerm.sh ${_pkgdir}/DEBIAN/prerm -#install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm +install -Dm755 "${srcdir}/${_pkgarch}.control" "${_pkgdir}/DEBIAN/control" +#install -Dm755 "${srcdir}/${_scripts}/preinst.sh" "${_pkgdir}/DEBIAN/preinst" +install -Dm755 "${srcdir}/postinst.sh" "${_pkgdir}/DEBIAN/postinst" +install -Dm755 "${srcdir}/prerm.sh" "${_pkgdir}/DEBIAN/prerm" +#install -Dm755 "${srcdir}/${_scripts}/postrm.sh" "${_pkgdir}/DEBIAN/postrm" _msg2 'creating the debian package' #create the debian package -cd $pkgdir -dpkg-deb --build -z9 ${_debpkgdir} +cd "$pkgdir" +dpkg-deb --build -z9 "${_debpkgdir}" mv *.deb ../../ done #exit so the arch package doesn't get built diff --git a/updates.sh b/updates.sh index 674fcbed2deb..ac41115fb910 100755 --- a/updates.sh +++ b/updates.sh @@ -1,9 +1,4 @@ #!/bin/bash -#re-archive the scripts and update the checksums, etc. -#NOTE THAT THIS EXPECTS THE SCRIPTS HAVE BEEN EDITED LOCALLY -#git pull and tar -xf skywire-scripts.tar.gz before commiting and pushing -#tar -hczvf 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%%-*} @@ -25,11 +20,8 @@ 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" -[[ -f cc.dev.PKGBUILD ]] && echo "updating checksums and version for cc.dev.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" cc.dev.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" cc.dev.PKGBUILD && updpkgsums cc.dev.PKGBUILD && _ccdevPKGBUILD="cc.dev.PKGBUILD" -[[ -f deb.PKGBUILD ]] &&echo "updating checksums and version for deb.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" deb.PKGBUILD && updpkgsums deb.PKGBUILD && _debPKGBUILD="deb.PKGBUILD" -[[ -f dev.PKGBUILD ]] && echo "updating checksums and version for dev.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" dev.PKGBUILD && updpkgsums dev.PKGBUILD && _devPKGBUILD="dev.PKGBUILD" -[[ -f git.PKGBUILD ]] && echo "updating checksums and version for git.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" git.PKGBUILD && updpkgsums git.PKGBUILD && _gitPKGBUILD="git.PKGBUILD" +[[ -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 echo "creating .SRCINFO" makepkg --printsrcinfo > .SRCINFO #sha256sum skywire-scripts.tar.gz |