From 0994ac7d5a26290a46bbf033d6bd63cb4a4d5ad3 Mon Sep 17 00:00:00 2001
From: Orazio <orazioedoardo@users.noreply.github.com>
Date: Sat, 25 Jan 2020 14:24:04 +0100
Subject: [PATCH] Fixed cosmetic issue with spinner, added missing spinner to
 some APT commands

---
 auto_install/install.sh | 13 +++++++------
 scripts/uninstall.sh    |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/auto_install/install.sh b/auto_install/install.sh
index e4817c4..774eb43 100755
--- a/auto_install/install.sh
+++ b/auto_install/install.sh
@@ -335,7 +335,7 @@ spinner(){
 	local pid=$1
 	local delay=0.50
 	local spinstr='/-\|'
-	while ps a | awk '{print $1}' | grep "${pid}"; do
+	while ps a | awk '{print $1}' | grep -q "$pid"; do
 		local temp=${spinstr#?}
 		printf " [%c]  " "${spinstr}"
 		local spinstr=${temp}${spinstr%"$temp"}
@@ -399,7 +399,7 @@ updatePackageCache(){
 		echo ":::"
 		echo -ne "::: ${PKG_MANAGER} update has not been run today. Running now...\\n"
         # shellcheck disable=SC2086
-		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null
+		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 		echo " done!"
 	fi
 }
@@ -1004,7 +1004,7 @@ installOpenVPN(){
 		wget -qO- https://swupdate.openvpn.net/repos/repo-public.gpg | $SUDO apt-key add -
 		echo "deb https://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/pivpn-openvpn-repo.list > /dev/null
 		# shellcheck disable=SC2086
-		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null
+		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 	fi
 
 	echo "::: Installing OpenVPN from Debian package... "
@@ -1036,7 +1036,7 @@ installWireGuard(){
 
 			$SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138
             # shellcheck disable=SC2086
-			$SUDO ${UPDATE_PKG_CACHE} &> /dev/null
+			$SUDO ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 			PIVPN_DEPS=(raspberrypi-kernel-headers wireguard wireguard-tools wireguard-dkms)
 			installDependentPackages PIVPN_DEPS[@]
 
@@ -1137,7 +1137,7 @@ installWireGuard(){
 		echo "deb https://deb.debian.org/debian/ unstable main" | $SUDO tee /etc/apt/sources.list.d/pivpn-unstable.list > /dev/null
 		printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' | $SUDO tee /etc/apt/preferences.d/pivpn-limit-unstable > /dev/null
         # shellcheck disable=SC2086
-		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null
+		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 		PIVPN_DEPS=(linux-headers-amd64 qrencode wireguard wireguard-tools wireguard-dkms)
 		installDependentPackages PIVPN_DEPS[@]
 
@@ -1145,7 +1145,8 @@ installWireGuard(){
 
 		echo "::: Installing WireGuard from PPA... "
 		$SUDO add-apt-repository ppa:wireguard/wireguard -y
-		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null
+		# shellcheck disable=SC2086
+		$SUDO ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 		PIVPN_DEPS=(qrencode wireguard wireguard-tools wireguard-dkms linux-headers-generic)
 		installDependentPackages PIVPN_DEPS[@]
 
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
index 498b07e..23c06e3 100755
--- a/scripts/uninstall.sh
+++ b/scripts/uninstall.sh
@@ -5,6 +5,7 @@
 ### FIXME: use variables where appropriate, reduce magic numbers by 99.9%, at least.
 
 PKG_MANAGER="apt-get"
+UPDATE_PKG_CACHE="${PKG_MANAGER} update"
 subnetClass="24"
 setupVars="/etc/pivpn/setupVars.conf"
 
@@ -33,7 +34,7 @@ spinner(){
 	local pid=$1
 	local delay=0.50
 	local spinstr='/-\|'
-	while ps a | awk '{print $1}' | grep "$pid"; do
+	while ps a | awk '{print $1}' | grep -q "$pid"; do
 		local temp=${spinstr#?}
 		printf " [%c]  " "$spinstr"
 		local spinstr=$temp${spinstr%"$temp"}
@@ -113,10 +114,10 @@ removeAll(){
 							if [ "$PLAT" = "Debian" ] || { [ "$PLAT" = "Raspbian" ] && [ "$(uname -m)" = "armv7l" ]; }; then
 								rm -f /etc/apt/sources.list.d/pivpn-unstable.list
 								rm -f /etc/apt/preferences.d/pivpn-limit-unstable
-								$PKG_MANAGER update &> /dev/null
+								${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 							elif [ "$PLAT" = "Ubuntu" ]; then
 								add-apt-repository ppa:wireguard/wireguard -r -y
-								$PKG_MANAGER update &> /dev/null
+								${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 							fi
 
 						elif [ "${i}" = "wireguard-dkms" ]; then
@@ -152,7 +153,7 @@ removeAll(){
 
 							if [ "$PLAT" = "Debian" ] || [ "$PLAT" = "Ubuntu" ]; then
 								rm -f /etc/apt/sources.list.d/pivpn-openvpn-repo.list
-								$PKG_MANAGER update &> /dev/null
+								${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
 							fi
 							deluser openvpn
 							rm -f /etc/rsyslog.d/30-openvpn.conf