Merge branch 'master' into dev

This commit is contained in:
Kristian Haugene
2020-08-24 21:08:15 +02:00

View File

@@ -8,9 +8,7 @@ export NORDVPN_CATEGORY
if [[ -n $OPENVPN_CONFIG ]]; then if [[ -n $OPENVPN_CONFIG ]]; then
tmp_Protocol="${OPENVPN_CONFIG##*.}" echo "Downloading user specified config. NORDVPN_PROTOCOL is set to: ${NORDVPN_PROTOCOL}"
export NORDVPN_PROTOCOL=${tmp_Protocol^^}
echo "Setting NORDVPN_PROTOCOL to: ${NORDVPN_PROTOCOL}"
${VPN_PROVIDER_HOME}/updateConfigs.sh --openvpn-config ${VPN_PROVIDER_HOME}/updateConfigs.sh --openvpn-config
elif [[ -n $NORDVPN_COUNTRY ]]; then elif [[ -n $NORDVPN_COUNTRY ]]; then
export OPENVPN_CONFIG=$(${VPN_PROVIDER_HOME}/updateConfigs.sh) export OPENVPN_CONFIG=$(${VPN_PROVIDER_HOME}/updateConfigs.sh)