From b60cddc4a9890d4999a98a004dfa7ca6159447a3 Mon Sep 17 00:00:00 2001
From: Dan Head <me@danielhead.com>
Date: Thu, 16 Nov 2017 16:20:24 +0000
Subject: [PATCH] Fix vpn script

---
 bin/vpn | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/vpn b/bin/vpn
index f4149b3..d87327a 100755
--- a/bin/vpn
+++ b/bin/vpn
@@ -7,22 +7,24 @@ PROTO=tcp
 
 if [ "$1" == "--update" ] || [ "$1" == "-u" ]; then
   echo "Updating..."
-  curl $OVPNURL > /tmp/nordvpn.zip
+  curl -L $OVPNURL --output /tmp/nordvpn.zip
   rm -f $OVPNPATH/*
   unzip -qq /tmp/nordvpn.zip -d $OVPNPATH/
   rm /tmp/nordvpn.zip
   sed -i 's,auth-user-pass,auth-user-pass '"$OVPNAUTH"',g' $OVPNPATH/*
-  echo "Done."
+  echo "Done"
   exit 0
 elif [ "$1" == "--kill" ] || [ "$1" == "-k" ]; then
-  sudo killall openvpn
+  sudo killall -q openvpn
 else
-  find $OVPNPATH -name $1
-  find $OVPNPATH -name "*$1*$PROTO*" | sort -R | tail -1 | while read file; do
-    sudo killall openvpn
-    echo "Connecting to: $file"
-    sudo /usr/sbin/openvpn --config $file &
-  done 
+  file=$(find $OVPNPATH -name "*$1*$PROTO*" | sort -R | tail -1)
+  if [ "$file" == "" ]; then
+    echo "No config found"
+    exit 1
+  fi
+  sudo killall -q openvpn
+  while pgrep -x openvpn >/dev/null; do sleep 1; done
+  sudo /usr/sbin/openvpn --config $file &
 fi
 
 exit 0