update to v1.0.0-rc2; revise scripts & improve desktop integration

4 files changed, 66 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a07e1427a9e6..83eec7c50315 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-bin
 	pkgdesc = Skywire: Decentralize the web. Skycoin.com
-	pkgver = 0.6.0
-	pkgrel = 18
+	pkgver = 1.0.0
+	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -18,22 +18,22 @@ pkgbase = skywire-bin
 	provides = skywire
 	conflicts = skywire
 	source = skywire-scripts.tar.gz
-	sha256sums = c73ef43a2e7a9536ce098a6d7a27300ec6afbcda2291e7e8245e393355eebfcf
-	source_i686 = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-386.tar.gz
-	sha256sums_i686 = 0b2db6c8bb3877e5da1bb6597c9353ff0527a00a1a2a7e5158a2d28f43b8b70e
-	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-amd64.tar.gz
-	sha256sums_x86_64 = 2358b979e9eb917ffcbaf2236051a300d0d0f684edfeec840399c09d75751aa1
-	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-arm64.tar.gz
-	sha256sums_aarch64 = bd8e28b1829bb17d6a975c2c0b93c5355ba90540a84541aa3852ea93c1445810
-	source_armv8 = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-arm64.tar.gz
-	sha256sums_armv8 = bd8e28b1829bb17d6a975c2c0b93c5355ba90540a84541aa3852ea93c1445810
-	source_armv7 = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-arm.tar.gz
-	sha256sums_armv7 = a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166
-	source_armv7l = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-arm.tar.gz
-	sha256sums_armv7l = a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166
-	source_armv7h = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-arm.tar.gz
-	sha256sums_armv7h = a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166
-	source_arm = https://github.com/skycoin/skywire/releases/download/v0.6.0/skywire-v0.6.0-linux-arm.tar.gz
-	sha256sums_arm = a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166
+	sha256sums = c4ae79cd455f557c74f19b8cfd206712d4d16224743277e8b2e58db508bbdeba
+	source_i686 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-386.tar.gz
+	sha256sums_i686 = ed94d9b60188ab5a535c5e2b0c2cba28b8274f15ea081fcf99856aa2ae7dc927
+	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-amd64.tar.gz
+	sha256sums_x86_64 = 284e12906c8656a603477c7a13c51a5266fe289fce3bed61206d88a59de1169c
+	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-arm64.tar.gz
+	sha256sums_aarch64 = 12d0c6a72af7c8ec951117982b2ea22dc6d5fc29f1aba174bc8cac3d329a5082
+	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-arm64.tar.gz
+	sha256sums_armv8 = 12d0c6a72af7c8ec951117982b2ea22dc6d5fc29f1aba174bc8cac3d329a5082
+	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-arm.tar.gz
+	sha256sums_armv7 = eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508
+	source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-arm.tar.gz
+	sha256sums_armv7l = eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508
+	source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-arm.tar.gz
+	sha256sums_armv7h = eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508
+	source_arm = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc2/skywire-systray-v1.0.0-rc2-linux-arm.tar.gz
+	sha256sums_arm = eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508
 
 pkgname = skywire-bin
diff --git a/PKGBUILD b/PKGBUILD
index d0c8a31647b7..d866c4453d46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,13 @@
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 pkgname=skywire-bin
 _pkgname=${pkgname/-bin}
+_pkgname1=${pkgname/-bin/-systray}
 _githuborg=skycoin
 pkgdesc="Skywire: Decentralize the web. Skycoin.com"
-pkgver='0.6.0'
-pkgrel=18
-_pkgver=${pkgver}
+pkgver='1.0.0'
+pkgrel=1
+_rc='-rc2'
+_pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
@@ -18,17 +20,17 @@ conflicts=( 'skywire' )
 install=skywire.install
 _scripts=${_pkgname}-scripts
 source=("${_scripts}.tar.gz" )
-sha256sums=('c73ef43a2e7a9536ce098a6d7a27300ec6afbcda2291e7e8245e393355eebfcf')
-sha256sums_i686=('0b2db6c8bb3877e5da1bb6597c9353ff0527a00a1a2a7e5158a2d28f43b8b70e')
-sha256sums_x86_64=('2358b979e9eb917ffcbaf2236051a300d0d0f684edfeec840399c09d75751aa1')
-sha256sums_aarch64=('bd8e28b1829bb17d6a975c2c0b93c5355ba90540a84541aa3852ea93c1445810')
-sha256sums_armv8=('bd8e28b1829bb17d6a975c2c0b93c5355ba90540a84541aa3852ea93c1445810')
-sha256sums_armv7=('a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166')
-sha256sums_armv7l=('a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166')
-sha256sums_armv7h=('a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166')
-sha256sums_arm=('a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166')
+sha256sums=('c4ae79cd455f557c74f19b8cfd206712d4d16224743277e8b2e58db508bbdeba')
+sha256sums_i686=('ed94d9b60188ab5a535c5e2b0c2cba28b8274f15ea081fcf99856aa2ae7dc927')
+sha256sums_x86_64=('284e12906c8656a603477c7a13c51a5266fe289fce3bed61206d88a59de1169c')
+sha256sums_aarch64=('12d0c6a72af7c8ec951117982b2ea22dc6d5fc29f1aba174bc8cac3d329a5082')
+sha256sums_armv8=('12d0c6a72af7c8ec951117982b2ea22dc6d5fc29f1aba174bc8cac3d329a5082')
+sha256sums_armv7=('eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508')
+sha256sums_armv7l=('eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508')
+sha256sums_armv7h=('eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508')
+sha256sums_arm=('eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508')
 #https://github.com/skycoin/skywire/releases/download/v0.6.0-rc1/skywire-v0.6.0-rc1-linux-amd64.tar.gz
-_binarchive=("${_pkgname}-${_tag_ver}-linux")
+_binarchive=("${_pkgname1}-${_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")
@@ -43,7 +45,7 @@ source_i686=("${_release_url}-386.tar.gz")
 #  tar -czvf skywire-scripts.tar.gz skywire-scripts && updpkgsums
 
 package() {
-_msg2 'creating dirs'
+_msg2 'Creating dirs'
 #create directory trees or the visor might make them with weird permissions
 _pkgdir="${pkgdir}"
 _skydir="opt/skywire"
@@ -57,14 +59,14 @@ mkdir -p ${_pkgdir}/${_skydir}/apps
 mkdir -p ${_pkgdir}/${_skydir}/local
 mkdir -p ${_pkgdir}/${_skydir}/scripts
 
-_msg2 'installing binaries'
+_msg2 'Installing binaries'
 _binaries=("${_pkgname}-cli" "${_pkgname}-visor")
 for i in ${_binaries[@]}; do
 _msg3 "${i}"
  install -Dm755 ${srcdir}/${i} ${_pkgdir}/${_skybin}/${i}
  ln -rTsf ${_pkgdir}/${_skybin}/${i} ${_pkgdir}/usr/bin/${i}
 done
-_msg2 'installing app binaries'
+_msg2 'Installing app binaries'
 _apps=${srcdir}/apps
 _appbinaries=$( ls "${_apps}" )
 for i in ${_appbinaries}; do
@@ -73,7 +75,7 @@ for i in ${_appbinaries}; do
   ln -rTsf ${_pkgdir}/${_skyapps}/${i} ${_pkgdir}/usr/bin/${i}
 done
 
-_msg2 'installing scripts'
+_msg2 'Installing scripts'
 _scripts1=${srcdir}/${_scripts}/${_pkgname}
 _skywirescripts=$( ls ${_scripts1} )
 for i in ${_skywirescripts}; do
@@ -92,14 +94,17 @@ install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-con
 
 #install systemd services
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-user.service ${_pkgdir}/${_systemddir}/${_pkgname}-user.service
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.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
 
 #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
+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
+
 }
 
 _install2() {
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 8a1417919414..6191d1ade954 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -1,14 +1,16 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 pkgname=skywire-bin
-_pkgname=${pkgname/-bin}
+_pkgname=${pkgname/-bin/}
+_pkgname1=${pkgname/-bin/-systray}
 _githuborg=skycoin
 pkgdesc="Skywire: Decentralize the web. Skycoin.com. Debian package"
-pkgver='0.6.0'
-pkgrel=18
-_pkgver=${pkgver}
-_pkgrel=${pkgrel}
+pkgver='1.0.0'
+_rc='-rc2'
+_pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
+pkgrel=1
+_pkgrel=${pkgrel}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 _pkgarch=$(dpkg --print-architecture)
 _pkgarches=('armhf' 'arm64' 'amd64')
@@ -18,8 +20,8 @@ makedepends=('dpkg') # 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-mu
 depends=()
 _debdeps=""
 #_debdeps=""
-_scripts="skywire-deb-scripts"
-_binarchive=("${_pkgname}-${_tag_ver}-linux")
+_scripts="skywire-scripts"
+_binarchive=("${_pkgname1}-${_tag_ver}-linux")
 _release_url=("${url}/releases/download/${_tag_ver}/${_binarchive}")
 source=(
 "${_scripts}.tar.gz"
@@ -32,10 +34,10 @@ noextract=(
 "${_binarchive}-arm64.tar.gz"
 "${_binarchive}arm.tar.gz"
 )
-sha256sums=('fa42fb88711391d6fbf29ab457e3c6044735155707332af03afc77f506693fdc'
-            '2358b979e9eb917ffcbaf2236051a300d0d0f684edfeec840399c09d75751aa1'
-            'bd8e28b1829bb17d6a975c2c0b93c5355ba90540a84541aa3852ea93c1445810'
-            'a1e87d6fb8999caab7a9e71760c338faf2a4768141c0b1cfcdf806890090f166')
+sha256sums=('c4ae79cd455f557c74f19b8cfd206712d4d16224743277e8b2e58db508bbdeba'
+            '284e12906c8656a603477c7a13c51a5266fe289fce3bed61206d88a59de1169c'
+            '12d0c6a72af7c8ec951117982b2ea22dc6d5fc29f1aba174bc8cac3d329a5082'
+            'eb4a85c6eb6ac1280d4a8c4ddb36a2a2f049b807cdbc415acb945d48824e5508')
 
 build() {
   _msg2 'creating the DEBIAN/control files'
@@ -43,14 +45,14 @@ build() {
     _msg2 "_pkgarch=$i"
     local _pkgarch=$i
     #create control file for the debian package
-    echo "Package: skywire-bin" > ${srcdir}/${_pkgarch}.control
-    echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/${_pkgarch}.control
+    echo "Package: ${pkgname}" > ${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 "Provides: ${pkgname}" >> ${srcdir}/${_pkgarch}.control
-    echo "Maintainer: Skycoin" >> ${srcdir}/${_pkgarch}.control
+    echo "Provides: ${_pkgname}" >> ${srcdir}/${_pkgarch}.control
+    echo "Maintainer: ${_githuborg}" >> ${srcdir}/${_pkgarch}.control
     echo "Description: ${pkgdesc}" >> ${srcdir}/${_pkgarch}.control
 
   done
@@ -66,7 +68,7 @@ if [[ ${_pkgarch} == "armhf" ]] ; then
   local _pkgarch1=arm
 fi
 
-local _binaryarchive="${_pkgname}-${_tag_ver}-linux-${_pkgarch1}.tar.gz"
+local _binaryarchive="${_pkgname1}-${_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
@@ -76,7 +78,7 @@ tar -xf ${srcdir}/${_binaryarchive}
 
 _msg2 'creating dirs'
 #set up to create a .deb package
-_debpkgdir="${_pkgname}-bin-${pkgver}-${_pkgrel}-${_pkgarch}"
+_debpkgdir="${pkgname}-${pkgver}-${pkgrel}-${_pkgarch}"
 _pkgdir="${pkgdir}/${_debpkgdir}"
 _skydir="opt/skywire"
 _skyapps="${_skydir}/apps"
@@ -121,7 +123,7 @@ ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
 chmod +x ${_pkgdir}/usr/bin/*
 
 #install dmsghttp-config.json
-install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
+install -Dm644 ${pkgdir}/test/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
 
 _msg2 'installing systemd services'
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
@@ -133,9 +135,9 @@ install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-autoconfig-remote.servi
 
 #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
+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
@@ -159,7 +161,6 @@ _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() {
diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz
index fb03033b7f81..44bc3ef5a95a 100644
--- a/skywire-scripts.tar.gz
+++ b/skywire-scripts.tar.gz