update to v0.6.0-rc1. Add desktop integration. Change scripts for available flags

1 files changed, 21 insertions, 37 deletions

diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 87a727904739..500e5544d383 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -1,36 +1,25 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
-_projectname=skycoin
-pkgname=skywire
-_pkgname=${pkgname}
-_githuborg=${_projectname}
-pkgdesc="Skywire Mainnet Node implementation. Binary Release. Debian package"
-#set to native architecture with dpkg
+pkgname=skywire-bin
+_pkgname=${pkgname/-bin}
+_githuborg=skycoin
+pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package"
+pkgver='0.6.0'
+pkgrel=1
+_rc=1
+_pkgver=${pkgver}
+_pkgrel=${pkgrel}
+_tag_ver="v${_pkgver}-rc${_rc}"
+_pkggopath="github.com/${_githuborg}/${_pkgname}"
 _pkgarch=$(dpkg --print-architecture)
 _pkgarches=('armhf' 'arm64' 'amd64')
-#leave arch package as any
 arch=('any')
-#manually version for now
-_pkgver='0.5.1'
-_tag_ver=v${_pkgver}
-pkgver=${_pkgver}
-#pkgver='autogenerated'
-#pkgrel keeps getting reset when build is run
-_pkgrel=35
-#pkgrel=35
-pkgrel=${_pkgrel}
-_pkggopath="github.com/${_githuborg}/${_pkgname}"
 url="https://${_pkggopath}"
-license=()
-#make deps for every architecture are included here..
 makedepends=('dpkg') # 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring')
 depends=()
 _debdeps=""
 #_debdeps=""
 _scripts="skywire-deb-scripts"
-#source=("git+${url}.git#branch=${BRANCH:-develop}"
-#build to needed commit because of develop branch instability
-#source=("git+${url}.git" ##branch=${BRANCH:-develop}"
 _binarchive=("${_pkgname}-${_tag_ver}-linux")
 _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}")
 source=(
@@ -44,10 +33,10 @@ noextract=(
 "${_binarchive}-arm64.tar.gz"
 "${_binarchive}arm.tar.gz"
 )
-sha256sums=('c661fb78caa9dae961800069b188f8035b36cc151fe5665c8eb59c16da7c5781'
-            'bc5c2227de16bc71d16c73cafcdf071c9f6c40f715d9c5416bea66dcc5659eed'
-            '0fa0e5d00d7ac0eedd55efcf19e1e7fba9b0efc5b690d8ce27536f10e4a5f830'
-            '5749b7636744741e3ab0b7ca2016a3e3eab28d067c7220e1073b7852eeebc441')
+sha256sums=('26fca76a61727dca059a353e85dabd95517e08d5e09e3004350935e97b758c37'
+            'c54c1cd95930a49c5bdd08a5659cebfea8911128b3a62cecdf978827072596ca'
+            '17bb4058c668004079700563ab8b85201cc26313defe92e1dc3223679261bfec'
+            '0a9284f0c8d888a6adfa7259649b285d34cef2efcef22d0d9b46f1f5ade98966')
 
 build() {
   for i in ${_pkgarches[@]}; do
@@ -116,12 +105,6 @@ mkdir -p ${_pkgdir}/${_skydir}/scripts
 
 cd $_pkgdir
 
-
-#loop to install the binaries
-#_skywirebins=$( ls ${srcdir}/go/bin.${_pkgarch} )
-#for i in ${_skywirebins}; do
-#  _msg2 "$i"
-#done
 _msg3 'skywire-visor'
  install -Dm755 ${pkgdir}/test/${_pkgname}-visor ${_pkgdir}/${_skybin}/${_pkgname}-visor
  ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}-visor
@@ -154,9 +137,6 @@ ln -rTsf ${_pkgdir}/${_skyapps}/vpn-server ${_pkgdir}/usr/bin/apps/vpn-server
 chmod +x ${_pkgdir}/usr/bin/apps/vpn-server
 
 _msg2 'installing scripts'
-
-
-_msg2 'installing scripts'
 _skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} )
 for i in ${_skywirescripts}; do
   _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts}
@@ -167,7 +147,7 @@ ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
 ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}-hypervisor
 #ln -rTsf ${_pkgdir}/${_skyapps}/* ${_pkgdir}/usr/bin/apps/
 
-_msg2 'installing skywire systemd services'
+_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
@@ -175,6 +155,10 @@ 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
 
+#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}/usr/share/icons/hicolor/48x48/apps/skywire.png
+
 _msg2 'installing tls key and certificate generation scripts'
 #install -Dm755 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/generate-1.sh ${pkgdir}/${_skydir}/ssl/generate.sh
 install -Dm755 ${srcdir}/${_scripts}/ssl/generate.sh ${_pkgdir}/${_skydir}/ssl/generate.sh
@@ -182,7 +166,7 @@ ln -rTsf ${_pkgdir}/${_skydir}/ssl/generate.sh ${_pkgdir}/usr/bin/skywire-tls-ge
 #install -Dm644 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
 install -Dm644 ${srcdir}/${_scripts}/ssl/certificate.cnf ${_pkgdir}/${_skydir}/ssl/certificate.cnf
 
-_msg2 'installing skywire control file and install scripts'
+_msg2 'installing control file and install scripts'
 install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control
 install -Dm755 ${srcdir}/${_scripts}/postinst.sh ${_pkgdir}/DEBIAN/postinst
 #install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm