update to version 1.2.0

18 files changed, 317 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12a5f2719727..1fc9dd5086af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
 	pkgver = 1.2.0
-	pkgrel = 2
+	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 70412ca1cf10..d1e98baa0406 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='1.2.0'
-pkgrel=2
-#pkgrel=2
+pkgrel=1
+#pkgrel=1
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 1b213c429e08..817ccd13b288 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -6,8 +6,8 @@ _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Debian package; cross-compile."
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='1.2.0'
-pkgrel=2
-#pkgrel=2
+pkgrel=1
+#pkgrel=1
 _rc=''
 _pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
diff --git a/com.skywire.Skywire.desktop b/com.skywire.Skywire.desktop
new file mode 100644
index 000000000000..63b3ade988b0
--- /dev/null
+++ b/com.skywire.Skywire.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Categories=P2P;VPN;WWW;Network;Internet
+Exec=xdg-open http://127.0.0.1:8000/
+GenericName=Skywire Hypervisor Interface
+Comment=Skywire: Building a new Internet.
+Icon=skywire
+MimeType=application/x-skywire;
+Name=Skywire
+Terminal=false
+Type=Application
+StartupNotify=false
+Keywords=vpn;p2p;www;network;internet;
diff --git a/com.skywirevpn.SkywireVPN.desktop b/com.skywirevpn.SkywireVPN.desktop
new file mode 100644
index 000000000000..44aaeb1a0f67
--- /dev/null
+++ b/com.skywirevpn.SkywireVPN.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Categories=P2P;VPN;WWW;Network;Internet
+Exec=skywire-cli vpn ui
+GenericName=Skywire VPN Interface
+Comment=Skywire VPN Interface.
+Icon=skywirevpn
+MimeType=application/x-skywire;
+Name=SkywireVPN
+Terminal=false
+Type=Application
+StartupNotify=false
+Keywords=vpn;p2p;www;network;internet;
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index dbb2d7a41272..177cccff6632 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -9,7 +9,7 @@ _pkgarch=$(dpkg --print-architecture)
 #leave arch package as any
 arch=('any')
 pkgver='1.2.0'
-pkgrel=2
+pkgrel=1
 _rc=''
 _pkgver="${pkgver}${_rc}"
 _tag_ver="v${_pkgver}"
diff --git a/dev.PKGBUILD b/dev.PKGBUILD
index 19c2b607166b..f335d91800ae 100644
--- a/dev.PKGBUILD
+++ b/dev.PKGBUILD
@@ -6,8 +6,8 @@ _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation; develop branch - Debian package."
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='autogenerated'
-pkgrel=2
-#pkgrel=2
+pkgrel=1
+#pkgrel=1
 _pkgarch=$(dpkg --print-architecture)
 _pkgver=${pkgver}
 _pkgrel=${pkgrel}
diff --git a/git.PKGBUILD b/git.PKGBUILD
index 500620cbdaad..4a8e1389b96c 100644
--- a/git.PKGBUILD
+++ b/git.PKGBUILD
@@ -6,8 +6,8 @@ _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='autogenerated'
-pkgrel=2
-#pkgrel=2
+pkgrel=1
+#pkgrel=1
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
 url="https://${_pkggopath}"
 license=('license-free')
diff --git a/postinst.sh b/postinst.sh
new file mode 100644
index 000000000000..a04775cbb87e
--- /dev/null
+++ b/postinst.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+[[ -f /opt/skywire/scripts/skywire-autoconfig ]]  && /opt/skywire/scripts/skywire-autoconfig
diff --git a/prerm.sh b/prerm.sh
new file mode 100644
index 000000000000..7c58455949ff
--- /dev/null
+++ b/prerm.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+if [[ -d /opt/skywire/local ]]; then
+  rm -rf /opt/skywire/local
+fi
+if [[ -f /opt/skywire/skywire.json ]] ; then
+  rm -rf /opt/skywire/*.json
+fi
+if [[ -f /opt/skywire/users.db ]] ; then
+  rm -rf /opt/skywire/users.db
+fi
diff --git a/services.PKGBUILD b/services.PKGBUILD
index aa0b8996e9de..2f441935a93c 100644
--- a/services.PKGBUILD
+++ b/services.PKGBUILD
@@ -7,7 +7,7 @@ pkgdesc="Skywire production deployment services. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='autogenerated'
 pkgrel=1
-#pkgrel=2
+#pkgrel=1
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
 url="ssh://${_pkggopath}"
 license=('license-free')
diff --git a/skywire-autoconfig b/skywire-autoconfig
new file mode 100644
index 000000000000..f62ee4fc079d
--- /dev/null
+++ b/skywire-autoconfig
@@ -0,0 +1,220 @@
+#!/bin/bash
+#/opt/skywire/scripts/skywire-autoconfig
+#skywire autoconfiguration script for debian & archlinux packages
+#source the skyenv file if it exists - provided by the skybian package or the user
+[[ -f /etc/profile.d/skyenv.sh ]] && source /etc/profile.d/skyenv.sh
+#set NOAUTOCONFIG=true to avoid running the script in the postinstall
+if [[ ${NOAUTOCONFIG} == true ]]; then
+  #unset the env
+  NOAUTOCONFIG=''
+  echo "autoconfiguration disabled. to configure and start skywire run: skywire-autoconfig"
+  exit 0
+fi
+#check for root
+if [[ $EUID -ne 0 ]]; then
+	echo "root permissions required"
+	exit 1
+fi
+#grant network permissions to the vpn app binaries
+setcap cap_net_admin+ep /opt/skywire/apps/vpn-client
+setcap cap_net_admin+ep /opt/skywire/apps/vpn-server
+# determine if skywire is running via systemd
+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
+_nc='\033[0m'
+_red='\033[0;31m'
+_green='\033[0;32m'
+_yellow='\033[0;33m'
+_blue='\033[1;34m'
+_purple='\033[0;35m'
+_cyan='\033[0;36m'
+_bold='\033[1m'
+##set the argument to pass into functions##
+_1=${1}
+#recreate pacman logging
+_msg2() {
+	(( QUIET )) && return
+	local mesg=$1; shift
+	printf "${_cyan} ->${_nc}${_bold} ${mesg}${_nc}\n" "$@"
+}
+_msg3() {
+(( QUIET )) && return
+local mesg=$1; shift
+printf "${_blue} -->${_nc}${BOLD} ${mesg}${_nc}\n" "$@"
+}
+_errmsg1() {
+	(( QUIET )) && return
+	local mesg=$1; shift
+	printf "${_red}>>> Error:${_nc}${_bold} ${mesg}${_nc}\n" "$@"
+}
+_warnmsg1() {
+	(( QUIET )) && return
+	local mesg=$1; shift
+	printf "${_red}>>> Warning:${_nc}${_bold} ${mesg}${_nc}\n" "$@"
+}
+_errmsg2() {
+	(( QUIET )) && return
+	local mesg=$1; shift
+	printf "${_red}>>> FATAL:${_bold} ${mesg}${_nc}\n" "$@"
+}
+#helpful text
+_welcome(){
+	if [[ $(uname -m) == *"arm"* ]]; then
+		_msg2 "register your public key:"
+		_msg2 "${_blue}https://whitelist.skycoin.com/${_nc}"
+		_msg2 "track uptime:"
+		_msg2 "${_blue}http://ut.skywire.skycoin.com/uptimes${_nc}"
+	fi
+	_msg2 "support:
+${_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"
+  #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
+	if [[ ${_1} == "0" ]]; then
+    _retain_hv=""
+		unset _1
+		_is_hypervisor="-i"
+	fi
+	# 1 as argument drops remote hypervisors and does not create the local hv config
+  	if [[ ${_1} == "1" ]]; then
+      _retain_hv=""
+  		unset _1
+  		_is_hypervisor=""
+  	fi
+	# create the flag to set the remote hypervisor(s)
+	if [[ ! -z ${_1} ]]; then
+    _retain_hv=""
+		_hvpks="--hvpks ${_1}"	#shorthand flag: -j
+		_is_hypervisor=""
+	 fi
+	##generate (hyper)visor configuration##
+	# show config gen command used
+	_msg3 "Generating skywire config with command:
+${_cyan}skywire-cli ${_yellow}config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor}${_nc}"
+    skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor} >> /dev/null 2>&1
+    if [[ ${?} != 0 ]]; then
+      #print the error!
+      skywire-cli config gen -bepr ${_retain_hv} ${_is_hypervisor} ${_public_rpc} ${_vpn_server} ${_test_env} ${_hvpks} ${_no_autoconnect} ${_is_public_visor}
+      _err=$?
+      _errmsg2 "error generating skywire config"
+      exit ${_err}
+    fi
+	#logging check
+	if [[ -f /opt/skywire/skywire.json ]]; then
+		_msg3 "${_blue}Skywire${_nc} configuration updated
+config path: ${_purple}/opt/skywire/skywire.json${_nc}"
+  if [[ ! -f /etc/skywire-config.json ]]; then
+    _msg2 "backing up configuration to /etc/skywire-config.json"
+    cp -b /opt/skywire/skywire.json /etc/skywire-config.json
+  fi
+	else
+		_errmsg2 "expected config file not found at /opt/skywire/skywire.json"
+		exit 100
+	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 "
+fi
+#use public flag with env NOAUTOCONNECT=1
+if [[ ( ${NOAUTOCONNECT} -eq "1") ]]; then
+  _no_autoconnect="--autoconn "
+fi
+#enable VPN server automatically on config re-gen with env VPNSERVER=1
+if [[ ${VPNSERVER} -eq "1" ]]; then
+  _vpn_server="--servevpn "
+fi
+#default to retaining hypervisors already set
+_retain_hv="-x"
+#use test deployment instead of production with env TESTENV=1
+if [[ ${TESTENV} -eq "1" ]]; then
+	_test_env="--testenv"
+fi
+#check if >>this script<< is a child process of the systemd service i.e.:  run in dmsgpty terminal
+if [[ "${SYSTEMDCHILD}" -ne "1" ]]; then
+	_now="--now"
+fi
+
+#root portion of the config
+_msg2 "Configuring skywire"
+#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"
+  		cp -b  /etc/skywire-config.json /opt/skywire/skywire.json
+	fi
+fi
+#config generation
+_config_gen
+_svc=skywire
+if [[ $SKYBIAN == "true" ]]; then
+  _msg3 "Enabling ${_svc} service${_now/--/ and starting }..
+    systemctl enable ${_now} ${_svc}.service"
+systemctl enable ${_now} ${_svc}.service 2> /dev/null
+fi
+if [[ $DMSGPTYTERM == "1" ]]; then
+	if [[ ${_now} != "--now" ]]; then
+		_msg3 "Please restart ${_svc} service manually:
+		${_red}systemctl restart ${_svc} 2> /dev/null${_nc}"
+		exit 0
+	else
+		_msg3 "Please shut down your visor and start it again with:
+		${_red}systemctl start ${_svc} 2> /dev/null${_nc}"
+		exit 0
+	fi
+fi
+#restart the service
+	systemctl is-active --quiet ${_svc} && _msg3 "Restarting skywire.service..." && systemctl restart ${_svc} 2> /dev/null
+if ! systemctl is-active --quiet ${_svc} >/dev/null; then
+	 _msg2 "Start the skywire service with:
+	${_red}systemctl start ${_svc}${_nc}"
+	exit 0
+fi
+_pubkey=$(skywire-cli visor pk -p | tail -n1)
+_msg2 "Visor Public Key:
+${_green}${_pubkey}${_nc}"
+if [[ $_is_hypervisor == "-i" ]]; then
+	if [[ $(ps -o comm= -p $PPID) != "sshd" ]]; then
+		_msg2 "Starting now on:\n${_red}http://127.0.0.1:8000${_nc}"
+		_vpnurl=$(skywire-cli vpn url -p)
+		_msg2 "Use the vpn:\n${_red}${_vpnurl}${_nc}"
+	fi
+	_hpvurl="Access hypervisor UI from local network here:"
+	_lanips="$(ip addr show | grep -w inet | grep -v 127.0.0.1 | awk '{ print $2}' | cut -d "/" -f 1)"
+	for _lanip in $_lanips
+	do
+		_hpvurl+="\n${_yellow}http://${_lanip}:8000${_nc}"
+	done
+
+	_msg2 "$_hpvurl"
+	_welcome
+	_msg2 "run the following command on OTHER NODES to set this one as the hypervisor:"
+    echo -e "${_cyan}skywire-autoconfig ${_yellow}${_pubkey}${_nc}"
+    _msg2 "to see this text again run: ${_cyan}skywire-autoconfig${_nc}"
+else
+  	_msg2 "${_blue}Skywire${_nc} starting in visor mode"
+    _msg2 "Visor Public Key: ${_green}${_pubkey}${_nc}"
+    _welcome
+fi
diff --git a/skywire-autoconfig.service b/skywire-autoconfig.service
new file mode 100644
index 000000000000..06a9af51c1b6
--- /dev/null
+++ b/skywire-autoconfig.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=skywire-autoconfig
+After=systemd-networkd.service network.target armbian-firstrun.service armbian-resize-filesystem.service systemd-user-sessions.service network-online.target systend-networkd-wait-online.service NetworkManager-wait-online.service
+Before=skywire.service skywire-visor.service
+Wants=network-online.target
+
+[Service]
+Type=forking
+User=root
+Group=root
+Environment="SYSTEMDCHILD=1"
+ExecStart=/usr/bin/skywire-autoconfig
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire.png b/skywire.png
new file mode 100644
index 000000000000..5e8a58e621dd
--- /dev/null
+++ b/skywire.png
diff --git a/skywire.service b/skywire.service
new file mode 100644
index 000000000000..6f2e82cfa912
--- /dev/null
+++ b/skywire.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Skywire
+Before=skywire-visor.service
+Conflicts=skywire-visor.service
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=root
+Group=root
+Environment="SYSTEMDCHILD=1"
+ExecStart=/usr/bin/skywire -p $AUTOPEERHV
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywirevpn.png b/skywirevpn.png
new file mode 100644
index 000000000000..e816d1bada4a
--- /dev/null
+++ b/skywirevpn.png
diff --git a/systray-git.PKGBUILD b/systray-git.PKGBUILD
index 52d3fdc35163..1db1bfd8b902 100644
--- a/systray-git.PKGBUILD
+++ b/systray-git.PKGBUILD
@@ -7,8 +7,8 @@ _githuborg=${_projectname}
 pkgdesc="Skywire systray. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver='autogenerated'
-pkgrel=2
-#pkgrel=4
+pkgrel=1
+#pkgrel=1
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
 url="https://${_pkggopath}"
 license=()
diff --git a/updates.sh b/updates.sh
index 6979703fea46..e0991b4a2715 100755
--- a/updates.sh
+++ b/updates.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
-#skywire AUR update script
-rm skywire-autoconfig com.skywire.Skywire.desktop com.skywirevpn.SkywireVPN.desktop skywirevpn.png skywire.png skywire.service skywire-autoconfig.service
+#re-archive the scripts and update the checksums, etc.
+#NOTE THAT THIS EXPECTS THE SCRIPTS HAVE BEEN EDITED LOCALLY
+#git pull and tar -xf skywire-scripts.tar.gz before commiting and pushing
+#tar -hczvf skywire-scripts.tar.gz skywire-scripts
 #reset the pkgver to autogenerated
 _version=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1)
 _version=${_version##*/}
@@ -19,18 +21,19 @@ _version=${_version//v/}
 #fi
 echo ${_version}
 echo ${_vrc}
-echo "updating checksums and version for PKGBUILD"
-sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD && updpkgsums
-[[ -f cc.deb.PKGBUILD ]] && echo "updating checksums and version for cc.deb.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" cc.deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" cc.deb.PKGBUILD && updpkgsums cc.deb.PKGBUILD && _ccdebPKGBUILD="cc.deb.PKGBUILD"
-[[ -f deb.PKGBUILD ]] &&echo "updating checksums and version for deb.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" deb.PKGBUILD  && updpkgsums deb.PKGBUILD && _debPKGBUILD="deb.PKGBUILD"
-[[ -f dev.PKGBUILD ]] && echo "updating checksums and version for dev.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" dev.PKGBUILD && updpkgsums dev.PKGBUILD && _devPKGBUILD="dev.PKGBUILD"
-[[ -f git.PKGBUILD ]] && echo "updating checksums and version for git.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" git.PKGBUILD && updpkgsums git.PKGBUILD && _gitPKGBUILD="git.PKGBUILD"
-[[ -f services.PKGBUILD ]] && echo "updating checksums and version for services.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" services.PKGBUILD && updpkgsums services.PKGBUILD && _servicesPKGBUILD="services.PKGBUILD"
-[[ -f systray-git.PKGBUILD ]] && echo "updating checksums and version for systray-git.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" systray-git.PKGBUILD && updpkgsums systray-git.PKGBUILD && _systraygitPKGBUILD="systray-git.PKGBUILD"
+echo "updating checksums and version for PKGBUILDs"
+sed -i "s/^pkgver=.*/pkgver='${_version}'/" PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" PKGBUILD
+[[ -f cc.deb.PKGBUILD ]] && echo "updating checksums and version for cc.deb.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" cc.deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" cc.deb.PKGBUILD
+[[ -f cc.dev.PKGBUILD ]] && echo "updating checksums and version for cc.dev.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" cc.dev.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" cc.dev.PKGBUILD
+[[ -f deb.PKGBUILD ]] &&echo "updating checksums and version for deb.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='${_version}'/" deb.PKGBUILD && sed -i "s/^_rc=.*/_rc='${_vrc}'/" deb.PKGBUILD
+[[ -f dev.PKGBUILD ]] && echo "updating checksums and version for dev.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" dev.PKGBUILD
+[[ -f git.PKGBUILD ]] && echo "updating checksums and version for git.PKGBUILD" && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" git.PKGBUILD
+ls *PKGBUILD | parallel updpkgsums {}
 echo "creating .SRCINFO"
 makepkg --printsrcinfo > .SRCINFO
-rm skywire-autoconfig com.skywire.Skywire.desktop com.skywirevpn.SkywireVPN.desktop skywirevpn.png skywire.png skywire.service skywire-autoconfig.service
+#sha256sum skywire-scripts.tar.gz
 echo "don't forget to increment pkgrel if you edited the PKGBUILD"
+source PKGBUILD && echo "pkgver=${pkgver}" && echo "pkgrel=${pkgrel}"
 echo
-echo "git add -f ${_debPKGBUILD} ${_ccdebPKGBUILD} ${_devPKGBUILD} ${_gitPKGBUILD} ${_servicesPKGBUILD} ${_systraygitPKGBUILD} PKGBUILD .SRCINFO updates.sh test.sh"
+echo "git add -f" *PKGBUILD " .SRCINFO skywire-autoconfig com.skywire.Skywire.desktop com.skywirevpn.SkywireVPN.desktop skywirevpn.png skywire.png skywire.service skywire-autoconfig.service postinst.sh prerm.sh skywire.install updates.sh test.sh"
 echo 'git commit -m " "'