From d2e9b5ff91124cd46151e01b03d77359b27db6a3 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 27 Aug 2022 21:51:19 -0500 Subject: [PATCH] Cleanup --- extras/quickstart.sh | 5 +++-- vpnsetup.sh | 5 +++-- vpnsetup_alpine.sh | 2 +- vpnsetup_amzn.sh | 2 +- vpnsetup_centos.sh | 2 +- vpnsetup_ubuntu.sh | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/extras/quickstart.sh b/extras/quickstart.sh index eced71e..5934afd 100755 --- a/extras/quickstart.sh +++ b/extras/quickstart.sh @@ -188,7 +188,7 @@ check_dns() { check_server_dns() { if [ -n "$VPN_DNS_NAME" ] && ! check_dns_name "$VPN_DNS_NAME"; then - exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." + exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." fi } @@ -266,7 +266,8 @@ run_setup() { if ( set -x; wget -t 3 -T 30 -q -O "$tmpdir/vpn.sh" "$setup_url1" \ || wget -t 3 -T 30 -q -O "$tmpdir/vpn.sh" "$setup_url2" \ || curl -fsL "$setup_url1" -o "$tmpdir/vpn.sh" 2>/dev/null ); then - VPN_IPSEC_PSK="$VPN_IPSEC_PSK" VPN_USER="$VPN_USER" VPN_PASSWORD="$VPN_PASSWORD" \ + VPN_IPSEC_PSK="$VPN_IPSEC_PSK" VPN_USER="$VPN_USER" \ + VPN_PASSWORD="$VPN_PASSWORD" \ VPN_PUBLIC_IP="$VPN_PUBLIC_IP" VPN_L2TP_NET="$VPN_L2TP_NET" \ VPN_L2TP_LOCAL="$VPN_L2TP_LOCAL" VPN_L2TP_POOL="$VPN_L2TP_POOL" \ VPN_XAUTH_NET="$VPN_XAUTH_NET" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ diff --git a/vpnsetup.sh b/vpnsetup.sh index eced71e..5934afd 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -188,7 +188,7 @@ check_dns() { check_server_dns() { if [ -n "$VPN_DNS_NAME" ] && ! check_dns_name "$VPN_DNS_NAME"; then - exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." + exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." fi } @@ -266,7 +266,8 @@ run_setup() { if ( set -x; wget -t 3 -T 30 -q -O "$tmpdir/vpn.sh" "$setup_url1" \ || wget -t 3 -T 30 -q -O "$tmpdir/vpn.sh" "$setup_url2" \ || curl -fsL "$setup_url1" -o "$tmpdir/vpn.sh" 2>/dev/null ); then - VPN_IPSEC_PSK="$VPN_IPSEC_PSK" VPN_USER="$VPN_USER" VPN_PASSWORD="$VPN_PASSWORD" \ + VPN_IPSEC_PSK="$VPN_IPSEC_PSK" VPN_USER="$VPN_USER" \ + VPN_PASSWORD="$VPN_PASSWORD" \ VPN_PUBLIC_IP="$VPN_PUBLIC_IP" VPN_L2TP_NET="$VPN_L2TP_NET" \ VPN_L2TP_LOCAL="$VPN_L2TP_LOCAL" VPN_L2TP_POOL="$VPN_L2TP_POOL" \ VPN_XAUTH_NET="$VPN_XAUTH_NET" VPN_XAUTH_POOL="$VPN_XAUTH_POOL" \ diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh index 0b1b043..908e8eb 100755 --- a/vpnsetup_alpine.sh +++ b/vpnsetup_alpine.sh @@ -130,7 +130,7 @@ check_dns() { check_server_dns() { if [ -n "$VPN_DNS_NAME" ] && ! check_dns_name "$VPN_DNS_NAME"; then - exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." + exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." fi } diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh index b46e19e..cb9fb1b 100755 --- a/vpnsetup_amzn.sh +++ b/vpnsetup_amzn.sh @@ -112,7 +112,7 @@ check_dns() { check_server_dns() { if [ -n "$VPN_DNS_NAME" ] && ! check_dns_name "$VPN_DNS_NAME"; then - exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." + exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." fi } diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh index eff421a..c81c078 100755 --- a/vpnsetup_centos.sh +++ b/vpnsetup_centos.sh @@ -158,7 +158,7 @@ check_dns() { check_server_dns() { if [ -n "$VPN_DNS_NAME" ] && ! check_dns_name "$VPN_DNS_NAME"; then - exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." + exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." fi } diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh index 3f8da84..ee6c566 100755 --- a/vpnsetup_ubuntu.sh +++ b/vpnsetup_ubuntu.sh @@ -149,7 +149,7 @@ check_dns() { check_server_dns() { if [ -n "$VPN_DNS_NAME" ] && ! check_dns_name "$VPN_DNS_NAME"; then - exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." + exiterr "Invalid DNS name. 'VPN_DNS_NAME' must be a fully qualified domain name (FQDN)." fi }