bump version to 1.3.8

5 files changed, 36 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f5943fa6474..96e8b8bd414c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-bin
 	pkgdesc = Skywire: Building a new Internet. Skycoin.com
-	pkgver = 1.3.7
-	pkgrel = 3
+	pkgver = 1.3.8
+	pkgrel = 4
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -29,7 +29,7 @@ pkgbase = skywire-bin
 	source = skywire.logrotate
 	source = skycoin
 	source = https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json
-	sha256sums = a55c345c144f18a1a58161630635aa08c7ff6cd4a73752368d0eaa43ecf7af92
+	sha256sums = 40f991d6ba6d9c1210287c6c8dcd4e19806720125926e1c968a7942ef34532b0
 	sha256sums = 40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058
 	sha256sums = 00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae
 	sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e
@@ -39,19 +39,19 @@ pkgbase = skywire-bin
 	sha256sums = b8d0b0afd03bf6c1cf9814874d7aa465f4d7e57075260f797993e46b33ab8480
 	sha256sums = 41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14
 	sha256sums = dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49
-	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-amd64.tar.gz
-	sha256sums_x86_64 = f890827593d5a8afd65ab6435c8d8b4ddbc66032ecb7fd875df98771ea6d89e8
-	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-arm64.tar.gz
-	sha256sums_aarch64 = ebf8b5317f863100efbe6c10053e75bd4a7177679640485ed2d6ddf2a15a6a2a
-	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-arm64.tar.gz
-	sha256sums_armv8 = ebf8b5317f863100efbe6c10053e75bd4a7177679640485ed2d6ddf2a15a6a2a
-	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-armhf.tar.gz
-	sha256sums_armv7 = e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989
-	source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-armhf.tar.gz
-	sha256sums_armv7l = e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989
-	source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-armhf.tar.gz
-	sha256sums_armv7h = e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989
-	source_arm = https://github.com/skycoin/skywire/releases/download/v1.3.7/skywire-v1.3.7-linux-arm.tar.gz
-	sha256sums_arm = ca93b9659cadee025f36d3e0c8674f60966b0a80f3082f905666f6bd57675a5f
+	source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-amd64.tar.gz
+	sha256sums_x86_64 = c55b79a6635a63b18076c7cb0e9b50178712d9b697fb2ea85398112c9ff9e1b5
+	source_aarch64 = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-arm64.tar.gz
+	sha256sums_aarch64 = ac6555e8b1f46662d58c89565a9fb81557c202ef45dca69115952f2e2c0d8aa6
+	source_armv8 = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-arm64.tar.gz
+	sha256sums_armv8 = ac6555e8b1f46662d58c89565a9fb81557c202ef45dca69115952f2e2c0d8aa6
+	source_armv7 = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-armhf.tar.gz
+	sha256sums_armv7 = fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a
+	source_armv7l = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-armhf.tar.gz
+	sha256sums_armv7l = fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a
+	source_armv7h = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-armhf.tar.gz
+	sha256sums_armv7h = fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a
+	source_arm = https://github.com/skycoin/skywire/releases/download/v1.3.8/skywire-v1.3.8-linux-arm.tar.gz
+	sha256sums_arm = b3f75cf9d3616a08c1caff17500cad45e02ab69525cab45e8017f8676447850d
 
 pkgname = skywire-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5376156e3b6b..441e53a399e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@ pkgname=skywire-bin
 _pkgname=${pkgname/-bin/}
 _githuborg=skycoin
 pkgdesc="Skywire: Building a new Internet. Skycoin.com"
-pkgver='1.3.7'
-pkgrel='3'
+pkgver='1.3.8'
+pkgrel='4'
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -32,7 +32,7 @@ _source=("${_script[@]}"
 "https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json"
 )
 source=("${_source[@]}")
-sha256sums=('a55c345c144f18a1a58161630635aa08c7ff6cd4a73752368d0eaa43ecf7af92'
+sha256sums=('40f991d6ba6d9c1210287c6c8dcd4e19806720125926e1c968a7942ef34532b0'
             '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058'
             '00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae'
             'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
@@ -42,13 +42,13 @@ sha256sums=('a55c345c144f18a1a58161630635aa08c7ff6cd4a73752368d0eaa43ecf7af92'
             'b8d0b0afd03bf6c1cf9814874d7aa465f4d7e57075260f797993e46b33ab8480'
             '41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14'
             'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49')
-sha256sums_x86_64=('f890827593d5a8afd65ab6435c8d8b4ddbc66032ecb7fd875df98771ea6d89e8')
-sha256sums_aarch64=('ebf8b5317f863100efbe6c10053e75bd4a7177679640485ed2d6ddf2a15a6a2a')
-sha256sums_armv8=('ebf8b5317f863100efbe6c10053e75bd4a7177679640485ed2d6ddf2a15a6a2a')
-sha256sums_armv7=('e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989')
-sha256sums_armv7l=('e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989')
-sha256sums_armv7h=('e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989')
-sha256sums_arm=('ca93b9659cadee025f36d3e0c8674f60966b0a80f3082f905666f6bd57675a5f')
+sha256sums_x86_64=('c55b79a6635a63b18076c7cb0e9b50178712d9b697fb2ea85398112c9ff9e1b5')
+sha256sums_aarch64=('ac6555e8b1f46662d58c89565a9fb81557c202ef45dca69115952f2e2c0d8aa6')
+sha256sums_armv8=('ac6555e8b1f46662d58c89565a9fb81557c202ef45dca69115952f2e2c0d8aa6')
+sha256sums_armv7=('fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a')
+sha256sums_armv7l=('fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a')
+sha256sums_armv7h=('fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a')
+sha256sums_arm=('b3f75cf9d3616a08c1caff17500cad45e02ab69525cab45e8017f8676447850d')
 #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
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 31229c770abb..f7cc41149cd0 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -23,7 +23,7 @@ noextract=(
 "${_binarchive}-armhf.tar.gz"
 "${_binarchive}-arm.tar.gz"
 )
-sha256sums=('a55c345c144f18a1a58161630635aa08c7ff6cd4a73752368d0eaa43ecf7af92'
+sha256sums=('40f991d6ba6d9c1210287c6c8dcd4e19806720125926e1c968a7942ef34532b0'
             '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058'
             '00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae'
             'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
@@ -33,10 +33,10 @@ sha256sums=('a55c345c144f18a1a58161630635aa08c7ff6cd4a73752368d0eaa43ecf7af92'
             'b8d0b0afd03bf6c1cf9814874d7aa465f4d7e57075260f797993e46b33ab8480'
             '41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14'
             'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49'
-            'f890827593d5a8afd65ab6435c8d8b4ddbc66032ecb7fd875df98771ea6d89e8'
-            'ebf8b5317f863100efbe6c10053e75bd4a7177679640485ed2d6ddf2a15a6a2a'
-            'e4ae31c884d3560c50385e558bb67f17f9262575d6fd6bb86568bd6525313989'
-            'ca93b9659cadee025f36d3e0c8674f60966b0a80f3082f905666f6bd57675a5f')
+            'c55b79a6635a63b18076c7cb0e9b50178712d9b697fb2ea85398112c9ff9e1b5'
+            'ac6555e8b1f46662d58c89565a9fb81557c202ef45dca69115952f2e2c0d8aa6'
+            'fa69750cb00d7dccdd5fa76ba483b522c84332b3bd70b7b8385537423db1e16a'
+            'b3f75cf9d3616a08c1caff17500cad45e02ab69525cab45e8017f8676447850d')
 
 build() {
   _msg2 'creating the DEBIAN/control files'
diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD
index 8977e703ebb6..b239d161949a 100644
--- a/cc.dev.PKGBUILD
+++ b/cc.dev.PKGBUILD
@@ -14,7 +14,7 @@ source=("git+${url}.git#branch=develop"
 "${_source[@]}"
 )
 sha256sums=('SKIP'
-            'a55c345c144f18a1a58161630635aa08c7ff6cd4a73752368d0eaa43ecf7af92'
+            '40f991d6ba6d9c1210287c6c8dcd4e19806720125926e1c968a7942ef34532b0'
             '40c80ccce9e89ae559050b943be1f09d905476c614a72d74fac2a58c821ac058'
             '00da5a9afdf5a8c7033978d2074039ba1ff7bc7a7221fbd278eb1270bdeb8eae'
             'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
diff --git a/skywire-autoconfig b/skywire-autoconfig
index ce31552d16ef..940f33aeeea5 100755
--- a/skywire-autoconfig
+++ b/skywire-autoconfig
@@ -24,11 +24,6 @@ if [[ $(ps -eo pid,comm,cgroup | grep skywire) == *"system.slice"* ]]; then
 WSYSTEMD=1
 fi
 #root portion of the configuration
-if [[ $DMSGPTYTERM -ne "1" ]] && [[ $WSYSTEMD -eq "1" ]]; then
-	#halt any running instance
-	systemctl is-active --quiet skywire-visor && systemctl disable --now skywire-visor 2> /dev/null
-	systemctl is-active --quiet skywire-hypervisor && systemctl disable --now skywire-hypervisor 2> /dev/null
-fi
 systemctl is-active --quiet skywire-autoconfig && systemctl disable skywire-autoconfig 2> /dev/null
 
 #make the logging of this script colorful
@@ -92,10 +87,8 @@ ${_blue}https://t.me/skywire${_nc}"
 }
 #generate config as root
 _config_gen() {
-  # remove any existing symlink
-  [[ -f /opt/skywire/skywire-visor.json ]] && rm /opt/skywire/skywire-visor.json
   #create by default the local hypervisor config if no config exists ; and retain any hypervisor config which exists
-  [[ (! -f /opt/skywire/skywire.json) || ($(cat /opt/skywire/skywire.json | grep -Po '"hypervisor":') != "") ]] &&	_is_hypervisor="-i"
+  [[ (! -f /opt/skywire/skywire.json) || ($(grep -Po '"hypervisor":' /opt/skywire/skywire.json) != "") ]] &&	_is_hypervisor="-i"
   #check for argument - remote pk or 0
   # 0 as argument drops any remote hypervisors which were set in the configuration
   # & triggers the creation of the local hyperisor configuration
@@ -150,10 +143,6 @@ fi
 if [[ ( ${DMSGHTTP} -eq "1") ]]; then
   _dmsghttp="--dmsghttp "
 fi
-#only use public rpc flag with env PUBLICRPC=1
-if [[ ( ${PUBLICRPC} -eq "1") ]]; then
-  _public_rpc="--publicrpc "
-fi
 #use public flag with env VISORISPUBLIC=1
 if [[ ( ${VISORISPUBLIC} -eq "1") ]]; then
   _is_public_visor="--public "
@@ -185,13 +174,13 @@ fi
 #attempt to import config if none exists - i.e. import skybian config or restore config
 if [[ ! -f /opt/skywire/skywire.json ]]; then
 	if [[ -f /etc/skywire-config.json ]]; then
-  		_warnmsg1 "Importing configuration from /etc/skywire-config.json to /opt/skywire/skywire.json"
+  		_msg3 "Importing configuration from /etc/skywire-config.json to /opt/skywire/skywire.json"
   		cp -b  /etc/skywire-config.json /opt/skywire/skywire.json
 	fi
 fi
 if [[ ! -f /opt/skywire/local/reward.txt ]]; then
 	if [[ -f /etc/reward.txt ]]; then
-  		_warnmsg1 "Importing reward address from /etc/reward.txt to /opt/skywire/local/reward.txt"
+  		_msg3 "Importing reward address from /etc/reward.txt to /opt/skywire/local/reward.txt"
   		cp -b  /etc/reward.txt /opt/skywire/local/reward.txt
 	fi
 fi