From a68435e6c3dfb1c54c295f803cdab554003bb254 Mon Sep 17 00:00:00 2001
From: redfast00 <redfast00@gmail.com>
Date: Tue, 4 Oct 2016 21:02:02 +0200
Subject: [PATCH] cleaned up removeOVPN.sh

---
 scripts/removeOVPN.sh | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/scripts/removeOVPN.sh b/scripts/removeOVPN.sh
index 6f7e433..d695e3b 100644
--- a/scripts/removeOVPN.sh
+++ b/scripts/removeOVPN.sh
@@ -6,9 +6,8 @@ REVOKE_STATUS=$(cat /etc/pivpn/REVOKE_STATUS)
 PLAT=$(cat /etc/pivpn/DET_PLATFORM)
 INDEX="/etc/openvpn/easy-rsa/keys/index.txt"
 
-if [ ! -f $INDEX ]; then
-        printf "The file: $INDEX \n"
-        printf "Was not Found!\n"
+if [ ! -f "$INDEX" ]; then
+        printf "The file: %s was not found\n" "$INDEX"
         exit 1
 fi
 
@@ -16,49 +15,49 @@ printf "\n"
 printf " ::\e[4m  Certificate List  \e[0m:: \n"
 
 i=0
-while read -r line || [[ -n "$line" ]]; do
-    status=$(echo $line | awk '{print $1}')
-    if [[ $status = "V" ]]; then
-        var=$(echo $line | sed -e 's/^.*CN=\([^/]*\)\/.*/\1/')
-        certs[$i]=$var
+while read -r line || [ -n "$line" ]; do
+    STATUS=$(echo "$line" | awk '{print $1}')
+    if [[ "$STATUS" = "V" ]]; then
+        NAME=$(echo "$line" | sed -e 's/^.*CN=\([^/]*\)\/.*/\1/')
+        CERTS[$i]=$NAME
         if [ "$i" != 0 ]; then
-            printf "  $var\n"
+            # Prevent printing "server" certificate
+            printf "  %s\n" "$NAME"
         fi
         let i=i+1
-        y=$i
     fi
 done <$INDEX
 printf "\n"
 
 echo "::: Please enter the Name of the client to be revoked from the list above:"
-read NAME
+read -r NAME
 
 if [[ -z "$NAME" ]]; then
-    printf '%s\n' "::: You can not leave this blank!"
+    echo "::: You can not leave this blank!"
     exit 1
 fi
 
-for((x=1;x<=$y;++x)); do
-    if [[ ${certs[$x]} = ${NAME} ]]; then
-        Valid=1
+for((x=1;x<=i;++x)); do
+    if [ "${CERTS[$x]}" = "${NAME}" ]; then
+        VALID=1
     fi
 done
 
-if [[ -z "$Valid" ]]; then
+if [ -z "$VALID" ]; then
     printf "::: You didn't enter a valid cert name!\n"
     exit 1
 fi
 
-cd /etc/openvpn/easy-rsa
+cd /etc/openvpn/easy-rsa || exit
 source /etc/openvpn/easy-rsa/vars
 
-./revoke-full $NAME
+./revoke-full "$NAME"
 echo "::: Certificate revoked, removing ovpns from /home/$INSTALL_USER/ovpns"
-rm /home/$INSTALL_USER/ovpns/$NAME.ovpn
+rm "/home/$INSTALL_USER/ovpns/$NAME.ovpn"
 cp /etc/openvpn/easy-rsa/keys/crl.pem /etc/openvpn/crl.pem
 echo "::: Completed!"
 
-if [ $REVOKE_STATUS == 0 ]; then
+if [ "$REVOKE_STATUS" == 0 ]; then
         echo 1 > /etc/pivpn/REVOKE_STATUS
         printf "\nThis seems to be the first time you have revoked a cert.\n"
         printf "We are adding the CRL to the server.conf and restarting openvpn.\n"