update script to detect DMSGPTYTERM env and restart correct skywire service ; change detection of running state of systemd services ; change service type to forking to support UI update button functionality

4 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d105eeaaab1..02afd803d20c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,7 @@ pkgbase = skywire-bin
 	provides = skywire
 	conflicts = skywire
 	source = skywire-scripts.tar.gz
-	sha256sums = 39587ebe9d7c757fd5d2ec59fbaeb0be943edafc03558eab67c8772a89154413
+	sha256sums = ffa0a31aad701bdc939923ef7299eb5fc40282e159aecb2c82d08f293e61aa07
 	source_i686 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc4/skywire-v1.0.0-rc4-linux-386.tar.gz
 	sha256sums_i686 = 93311432784e370d5b5638d95e2b80fbb20de65840d7728fb5c1b5491dbf0df1
 	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.0.0-rc4/skywire-v1.0.0-rc4-linux-amd64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 7f6194230e70..740a87d784ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ conflicts=( 'skywire' )
 install=skywire.install
 _scripts=${_pkgname}-scripts
 source=("${_scripts}.tar.gz" )
-sha256sums=('39587ebe9d7c757fd5d2ec59fbaeb0be943edafc03558eab67c8772a89154413')
+sha256sums=('ffa0a31aad701bdc939923ef7299eb5fc40282e159aecb2c82d08f293e61aa07')
 sha256sums_i686=('93311432784e370d5b5638d95e2b80fbb20de65840d7728fb5c1b5491dbf0df1')
 sha256sums_x86_64=('798a9ccf3ca26a0450c62bc8ad2d4fddbbfdd27501a83bb771af3d60a007c001')
 sha256sums_aarch64=('13f849a09634341be5bf93b660f852a0d3c793408a45c4b059cb17e37225a565')
@@ -95,11 +95,13 @@ chmod +x ${_pkgdir}/usr/bin/*
 install -Dm644 ${srcdir}/skywire/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
 
 #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
+_msg2 'Installing scripts'
+_systemd=${srcdir}/${_scripts}/systemd
+_skywiresystemd=$( ls ${_systemd} )
+for i in ${_skywiresystemd}; do
+install -Dm644 ${srcdir}/${_scripts}/systemd/${i} ${_pkgdir}/${_systemddir}/${i}
+done
+rm ${_pkgdir}/${_systemddir}/skywire-hypervisor.service
 
 #desktop integration
 install -Dm644 "${srcdir}"/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index f46e09627df0..164e584656fd 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -34,7 +34,7 @@ noextract=(
 "${_binarchive}-arm64.tar.gz"
 "${_binarchive}armhf.tar.gz"
 )
-sha256sums=('39587ebe9d7c757fd5d2ec59fbaeb0be943edafc03558eab67c8772a89154413'
+sha256sums=('ffa0a31aad701bdc939923ef7299eb5fc40282e159aecb2c82d08f293e61aa07'
             '798a9ccf3ca26a0450c62bc8ad2d4fddbbfdd27501a83bb771af3d60a007c001'
             '13f849a09634341be5bf93b660f852a0d3c793408a45c4b059cb17e37225a565'
             '7fd7b4e8d1dbc069383b3b3dc488552543f2ec622a30023284d0375a61c5d53d')
diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz
index 0c93ecfffdce..89ed03da0239 100644
--- a/skywire-scripts.tar.gz
+++ b/skywire-scripts.tar.gz