From 91cc3e95145d74bc38cad77ee534129f626c8260 Mon Sep 17 00:00:00 2001
From: Taiga San <taigasan@gmail.com>
Date: Sun, 9 Jun 2019 12:21:10 +0200
Subject: [PATCH 1/2] servers list update

---
 pia.sh | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/pia.sh b/pia.sh
index 25b6c27..9a6900b 100755
--- a/pia.sh
+++ b/pia.sh
@@ -223,16 +223,18 @@ flist()						# List available servers.
 		echo -n " $BOLD$RED[$RESET$i$BOLD$RED]$RESET "
 		SERVERNAME=$(cat $VPNPATH/servers.txt | head -n $i | tail -n 1 | awk '{print $1}')
 		case $SERVERNAME in
-			"Netherlands") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"Switzerland") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"CA_Toronto") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"CA_Montreal") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"CA_Vancouver") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"Romania") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"Israel") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"Sweden") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"France") echo $BOLD$GREEN$SERVERNAME$RESET;;
-			"Germany") echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"CA_Montreal")    echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"CA_Toronto")     echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"CA_Vancouver")   echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"Czech_Republic") echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"DE_Berlin")      echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"DE_Frankfurt")   echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"France")         echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"Israel")         echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"Romania")        echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"Spain")          echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"Sweden")         echo $BOLD$GREEN$SERVERNAME$RESET;;
+			"Switzerland")    echo $BOLD$GREEN$SERVERNAME$RESET;;
 			*) echo $SERVERNAME;;
 		esac
 	done
@@ -439,18 +441,21 @@ fconnect()						# Main function
 			fi
 		fi
 		case $SERVERNAME in
-			"Netherlands") fforward;;
-			"Switzerland") fforward;;
-			"CA_Toronto") fforward;;
-			"CA_Montreal") fforward;;
-			"Romania") fforward;;
-			"Israel") fforward;;
-			"Sweden") fforward;;
-			"France") fforward;;
-			"Germany") fforward;;
-			"CA_Vancouver") fforward;;
+			"CA_Montreal")    fforward;;
+			"CA_Toronto")     fforward;;
+			"CA_Vancouver")	  fforward;;
+			"Czech_Republic") fforward;;
+			"DE_Berlin")      fforward;;
+			"DE_Frankfurt")   fforward;;
+			"France")         fforward;;
+			"Israel")         fforward;;
+			"Romania")        fforward;;
+			"Spain")          fforward;;
+			"Sweden")         fforward;;
+			"Switzerland")    fforward;;
 			*) NOPORT=1;;
 		esac
+
 		if [ $NOPORT -eq 0 ];then
 			if [ $FORWARDEDPORT -gt 0 ] &>/dev/null;then
 				echo -e "\r$INFO Port $GREEN$BOLD$FORWARDEDPORT$RESET has been forwarded to you.                    "

From a8daf0211feb86ece8eb9829dbb1a3376478fda3 Mon Sep 17 00:00:00 2001
From: Taiga San <taigasan@gmail.com>
Date: Sat, 18 Apr 2020 13:35:18 +0200
Subject: [PATCH 2/2] add whois dependency

---
 README.md | 1 +
 pia.sh    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 31d7f9d..054d28c 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Dependencies:
 - openssl
 - curl
 - unzip
+- whois
 - git
 
 Installation:
diff --git a/pia.sh b/pia.sh
index 9a6900b..c5161c4 100755
--- a/pia.sh
+++ b/pia.sh
@@ -603,8 +603,9 @@ if [ $UNKNOWNOS -eq 1 ];then
 	command -v iptables >/dev/null 2>&1 || MISSINGDEP=1
 	command -v curl >/dev/null 2>&1 || MISSINGDEP=1
 	command -v unzip >/dev/null 2>&1 || MISSINGDEP=1
+	command -v whois >/dev/null 2>&1 || MISSINGDEP=1
 	if [ $MISSINGDEP -eq 1 ];then
-		echo "$ERROR OS not identified as arch or debian based, please install openvpn, openssl, iptables, curl and unzip and run script again."
+		echo "$ERROR OS not identified as arch or debian based, please install openvpn, openssl, iptables, curl, whois and unzip and run script again."
 		exit 1
 	fi
 else
@@ -613,6 +614,7 @@ else
 	command -v iptables >/dev/null 2>&1 || { echo >&2 "$INFO iptables required, installing...";$INSTALLCMD iptables; }
 	command -v curl >/dev/null 2>&1 || { echo >&2 "$INFO curl required, installing...";$INSTALLCMD curl; }
 	command -v unzip >/dev/null 2>&1 || { echo >&2 "$INFO unzip required, installing...";$INSTALLCMD unzip; }
+	command -v whois >/dev/null 2>&1 || { echo >&2 "$INFO whois required, installing...";$INSTALLCMD whois; }
 fi