diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 9 | ||||
| -rw-r--r-- | deb.PKGBUILD | 15 | ||||
| -rw-r--r-- | git.PKGBUILD | 18 | ||||
| -rwxr-xr-x | updates.sh | 2 |
6 files changed, 40 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire pkgdesc = Skywire Mainnet Node implementation. Skycoin.com pkgver = 0.6.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -7,8 +7,8 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver=0.6.0 -pkgrel=2 -#pkgrel=2 +pkgrel=3 +#pkgrel=3 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() @@ -110,9 +110,16 @@ done ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} +install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json + #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 + +#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 +ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png } diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index 5eace8559d84..fe0d6d9dc48e 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -5,8 +5,8 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Debian package; cross-compile." _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver=0.6.0 -pkgrel=2 -#pkgrel=2 +pkgrel=3 +#pkgrel=3 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() @@ -162,6 +162,11 @@ install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_s 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}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png +ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png + _msg2 'installing control file and install scripts' install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control #install -Dm755 ${srcdir}/${_scripts}/preinst.sh ${_pkgdir}/DEBIAN/preinst diff --git a/deb.PKGBUILD b/deb.PKGBUILD index 9adefabbd35a..dd2cc28daf77 100644 --- a/deb.PKGBUILD +++ b/deb.PKGBUILD @@ -12,9 +12,9 @@ arch=('any') #manually version for now pkgver='0.6.0' _pkgver=${pkgver} -pkgrel=2 +pkgrel=3 _pkgrel=${pkgrel} -#pkgrel=2 +#pkgrel=3 _pkggopath="github.com/${_githuborg}/${_pkgname}" url="https://${_pkggopath}" license=() @@ -79,7 +79,7 @@ echo "Priority: optional" >> ${srcdir}/control echo "Section: web" >> ${srcdir}/control echo "Architecture: ${_pkgarch}" >> ${srcdir}/control echo "Depends: ${_debdeps}" >> ${srcdir}/control -echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/control +echo "Maintainer: skycoin" >> ${srcdir}/control echo "Description: ${pkgdesc}" >> ${srcdir}/control } @@ -136,13 +136,20 @@ for i in ${_skywirescripts}; do _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts} done -_msg2 'renaming skywire-visor to skywire' mv ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} +_msg2 'installing dmsghttp-config.json' +install -Dm644 ${srcdir}/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 +_msg2 'installing desktop files and icon' +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 +ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.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 diff --git a/git.PKGBUILD b/git.PKGBUILD index 43c6958665f0..488a17132afd 100644 --- a/git.PKGBUILD +++ b/git.PKGBUILD @@ -7,8 +7,8 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='autogenerated' -pkgrel=1 -#pkgrel=2 +pkgrel=3 +#pkgrel=3 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() @@ -44,7 +44,6 @@ export CGO_ENABLED=1 #default anyways #use musl-gcc for static compilation export CC=musl-gcc - local _version="${pkgver}" DMSG_BASE="github.com/skycoin/dmsg" BUILDINFO_PATH="${DMSG_BASE}/buildinfo" @@ -57,9 +56,6 @@ cd ${srcdir}/go/src/${_pkggopath} #git checkout develop _cmddir=${srcdir}/go/src/${_pkggopath}/cmd -#static compilation with 'musl' avoids glibc runtime deps -#which cause binary to fail if correct glibc / libc6 is not found on the system - _msg2 "building skychat binary" cd ${_cmddir}/apps/skychat go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . @@ -128,10 +124,18 @@ 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} -#install the patched system.d services +_msg2 'installing dmsghttp-config.json' +install -Dm644 ${srcdir}/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 +_msg2 'installing desktop files and icon' +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 +ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png + #Install the correct autocofig script rm ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/.${_pkgname}-autoconfig-git.sh ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig diff --git a/updates.sh b/updates.sh index 589b00c2d823..38829ef64ac8 100755 --- a/updates.sh +++ b/updates.sh @@ -8,4 +8,4 @@ updpkgsums git.PKGBUILD sed -i "s/pkgver=0.6.0/pkgver='autogenerated'/" git.PKGBUILD updpkgsums makepkg --printsrcinfo > .SRCINFO -echo "git add -f cc.deb.PKGBUILD cc.deb.PKGBUILD git.PKGBUILD PKGBUILD .SRCINFO skywire-scripts.tar.gz skywire-deb-scripts.tar.gz updates.sh" +echo "git add -f deb.PKGBUILD cc.deb.PKGBUILD git.PKGBUILD PKGBUILD .SRCINFO skywire-scripts.tar.gz skywire-deb-scripts.tar.gz updates.sh" |