From 742e43ffcd0f87ec7174ea54670881f9acd52e5b Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Fri, 18 Mar 2022 21:52:20 -0500
Subject: [PATCH] Cleanup

---
 extras/ikev2setup.sh | 11 ++++-------
 vpnsetup_alpine.sh   |  8 ++++----
 vpnsetup_amzn.sh     |  8 ++++----
 vpnsetup_centos.sh   |  8 ++++----
 vpnsetup_ubuntu.sh   |  8 ++++----
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh
index 2901c9b..776fe81 100755
--- a/extras/ikev2setup.sh
+++ b/extras/ikev2setup.sh
@@ -150,7 +150,7 @@ confirm_or_abort() {
 show_header() {
 cat <<'EOF'
 
-IKEv2 Script   Copyright (c) 2020-2022 Lin Song   3 Mar 2022
+IKEv2 Script   Copyright (c) 2020-2022 Lin Song   19 Mar 2022
 
 EOF
 }
@@ -311,6 +311,7 @@ set_dns_servers() {
 show_welcome() {
 cat <<'EOF'
 Welcome! Use this script to set up IKEv2 on your VPN server.
+
 I need to ask you a few questions before starting setup.
 You can use the default options and just press enter if you are OK with them.
 
@@ -1219,12 +1220,6 @@ cat <<EOF
 *IMPORTANT* Password for client config files:
 $p12_password
 Write this down, you'll need it for import!
-EOF
-  else
-cat <<'EOF'
-
-Note: No password is required when importing
-client configuration.
 EOF
   fi
 cat <<'EOF'
@@ -1232,6 +1227,8 @@ cat <<'EOF'
 Next steps: Configure IKEv2 VPN clients. See:
 https://git.io/ikev2clients
 
+Send feedback: https://bit.ly/vpn-feedback
+
 ================================================
 
 EOF
diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh
index ec28d64..1f710c1 100755
--- a/vpnsetup_alpine.sh
+++ b/vpnsetup_alpine.sh
@@ -198,16 +198,16 @@ get_helper_scripts() {
   add_url="$base_url/add_vpn_user.sh"
   del_url="$base_url/del_vpn_user.sh"
   cd /opt/src || exit 1
+  printf '%s' "+ "
   for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
     [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
     [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
     [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
-    (
-      set -x
-      wget -t 3 -T 30 -q -O "$sc" "$dl_url"
-    ) || /bin/rm -f "$sc"
+    printf '%s' "$sc "
+    wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
     [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
   done
+  echo
 }
 
 get_swan_ver() {
diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh
index 3fa922f..b2fe6e7 100755
--- a/vpnsetup_amzn.sh
+++ b/vpnsetup_amzn.sh
@@ -198,16 +198,16 @@ get_helper_scripts() {
   add_url="$base_url/add_vpn_user.sh"
   del_url="$base_url/del_vpn_user.sh"
   cd /opt/src || exit 1
+  printf '%s' "+ "
   for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
     [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
     [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
     [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
-    (
-      set -x
-      wget -t 3 -T 30 -q -O "$sc" "$dl_url"
-    ) || /bin/rm -f "$sc"
+    printf '%s' "$sc "
+    wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
     [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
   done
+  echo
 }
 
 get_swan_ver() {
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 785df2c..dd96266 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -258,16 +258,16 @@ get_helper_scripts() {
   add_url="$base_url/add_vpn_user.sh"
   del_url="$base_url/del_vpn_user.sh"
   cd /opt/src || exit 1
+  printf '%s' "+ "
   for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
     [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
     [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
     [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
-    (
-      set -x
-      wget -t 3 -T 30 -q -O "$sc" "$dl_url"
-    ) || /bin/rm -f "$sc"
+    printf '%s' "$sc "
+    wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
     [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
   done
+  echo
 }
 
 get_swan_ver() {
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index 4fad926..726b80e 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -238,16 +238,16 @@ get_helper_scripts() {
   add_url="$base_url/add_vpn_user.sh"
   del_url="$base_url/del_vpn_user.sh"
   cd /opt/src || exit 1
+  printf '%s' "+ "
   for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
     [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
     [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
     [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
-    (
-      set -x
-      wget -t 3 -T 30 -q -O "$sc" "$dl_url"
-    ) || /bin/rm -f "$sc"
+    printf '%s' "$sc "
+    wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
     [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
   done
+  echo
 }
 
 get_swan_ver() {