From 43da3ea5f65ce1305a20d8711e54da35f9309e8c Mon Sep 17 00:00:00 2001
From: Tom Humphrey <tom.humphrey@mac.com>
Date: Wed, 27 Mar 2019 13:09:43 +0000
Subject: [PATCH] Fix for automatic setting of NORDVPN_PROTOCOL

NORDVPN_PROTOCOL wasn't being set correctly when an OPENVPN_CONFIG was provided. Now fixed.
---
 openvpn/nordvpn/updateConfigs.sh | 6 ++++--
 openvpn/start.sh                 | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/openvpn/nordvpn/updateConfigs.sh b/openvpn/nordvpn/updateConfigs.sh
index 217585b76..e28dc7a24 100755
--- a/openvpn/nordvpn/updateConfigs.sh
+++ b/openvpn/nordvpn/updateConfigs.sh
@@ -85,9 +85,9 @@ select_hostname() { #TODO return multiples
 download_hostname() {
     # "https://downloads.nordcdn.com/configs/files/ovpn_udp/servers/us3373.nordvpn.com.udp.ovpn"
     local nordvpn_cdn="https://downloads.nordcdn.com/configs/files/"
-    if [[ ${NORDVPN_PROTOCOL,,} =~ udp ]]; then
+    if [[ ${NORDVPN_PROTOCOL,,} == udp ]]; then
         nordvpn_cdn="${nordvpn_cdn}ovpn_udp/servers/"
-    elif [[ ${NORDVPN_PROTOCOL,,} =~ tcp ]];then
+    elif [[ ${NORDVPN_PROTOCOL,,} == tcp ]];then
         nordvpn_cdn="${nordvpn_cdn}ovpn_tcp/servers/"
     fi
 
@@ -100,6 +100,7 @@ download_hostname() {
     fi
 
     log "Downloading config: ${ovpnName}"
+    log "Downloading from: ${nordvpn_cdn}"
     curl ${nordvpn_cdn} -o "${ovpnName}"
 }
 update_hostname() {
@@ -134,6 +135,7 @@ then
     selected="default"    
 elif [[ ${1} == "--openvpn-config" ]] || [[ ${1} == "-o" ]]
 then
+    log "Using OpenVPN CONFIG :: ${OPENVPN_CONFIG,,}"
     download_hostname ${OPENVPN_CONFIG,,}
 elif [[ ! -z $NORDVPN_COUNTRY ]]
 then
diff --git a/openvpn/start.sh b/openvpn/start.sh
index 57a416f3e..bad8a2e64 100755
--- a/openvpn/start.sh
+++ b/openvpn/start.sh
@@ -43,7 +43,9 @@ then
 
     if [[ ! -z $OPENVPN_CONFIG ]]
     then
-      export NORDVPN_CATEGORY="${OPENVPN_CONFIG##*.^^}"
+      tmp_Protocol="${OPENVPN_CONFIG##*.}"
+      export NORDVPN_PROTOCOL=${tmp_Protocol^^}
+      echo "Setting NORDVPN_PROTOCOL to: ${NORDVPN_PROTOCOL}"
       ${VPN_PROVIDER_CONFIGS}/updateConfigs.sh --openvpn-config
     elif [[ ! -z $NORDVPN_COUNTRY ]]
     then