From e16151f183fb8fd0660905ee0199c18867b5a1c4 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sat, 29 Jan 2022 01:47:45 -0600
Subject: [PATCH] Improve upgrade scripts

- Cleanup
---
 extras/vpnupgrade_alpine.sh | 27 ++++++++-------------------
 extras/vpnupgrade_amzn.sh   | 29 +++++++++--------------------
 extras/vpnupgrade_centos.sh | 29 +++++++++--------------------
 extras/vpnupgrade_ubuntu.sh | 29 +++++++++--------------------
 4 files changed, 35 insertions(+), 79 deletions(-)

diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh
index b6d2e9b..c86ae08 100755
--- a/extras/vpnupgrade_alpine.sh
+++ b/extras/vpnupgrade_alpine.sh
@@ -78,25 +78,6 @@ Error: This script requires Libreswan already installed.
 EOF
     exit 1
   fi
-
-  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
-cat <<EOF
-You already have Libreswan version $SWAN_VER installed!
-If you continue, the same version will be re-installed.
-
-EOF
-    printf "Do you want to continue anyway? [y/N] "
-    read -r response
-    case $response in
-      [yY][eE][sS]|[yY])
-        echo
-        ;;
-      *)
-        echo "Abort. No changes were made."
-        exit 1
-        ;;
-    esac
-  fi
 }
 
 show_setup_info() {
@@ -121,6 +102,14 @@ WARNING: Older versions of Libreswan could contain known security vulnerabilitie
          See https://libreswan.org/security/ for more information.
          Are you sure you want to install an older version?
 
+EOF
+  fi
+
+  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
+cat <<EOF
+Note: You already have Libreswan version $SWAN_VER installed!
+      If you continue, the same version will be re-installed.
+
 EOF
   fi
 
diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index 4778247..175698f 100755
--- a/extras/vpnupgrade_amzn.sh
+++ b/extras/vpnupgrade_amzn.sh
@@ -46,7 +46,7 @@ check_libreswan() {
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.5 or 4.6
+       3.32, 4.1-4.6
 EOF
       exit 1
       ;;
@@ -61,25 +61,6 @@ Error: This script requires Libreswan already installed.
 EOF
     exit 1
   fi
-
-  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
-cat <<EOF
-You already have Libreswan version $SWAN_VER installed!
-If you continue, the same version will be re-installed.
-
-EOF
-    printf "Do you want to continue anyway? [y/N] "
-    read -r response
-    case $response in
-      [yY][eE][sS]|[yY])
-        echo
-        ;;
-      *)
-        echo "Abort. No changes were made."
-        exit 1
-        ;;
-    esac
-  fi
 }
 
 show_setup_info() {
@@ -104,6 +85,14 @@ WARNING: Older versions of Libreswan could contain known security vulnerabilitie
          See https://libreswan.org/security/ for more information.
          Are you sure you want to install an older version?
 
+EOF
+  fi
+
+  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
+cat <<EOF
+Note: You already have Libreswan version $SWAN_VER installed!
+      If you continue, the same version will be re-installed.
+
 EOF
   fi
 
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 3a18721..cb336f6 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -64,7 +64,7 @@ check_libreswan() {
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.5 or 4.6
+       3.32, 4.1-4.6
 EOF
       exit 1
       ;;
@@ -79,25 +79,6 @@ Error: This script requires Libreswan already installed.
 EOF
     exit 1
   fi
-
-  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
-cat <<EOF
-You already have Libreswan version $SWAN_VER installed!
-If you continue, the same version will be re-installed.
-
-EOF
-    printf "Do you want to continue anyway? [y/N] "
-    read -r response
-    case $response in
-      [yY][eE][sS]|[yY])
-        echo
-        ;;
-      *)
-        echo "Abort. No changes were made."
-        exit 1
-        ;;
-    esac
-  fi
 }
 
 show_setup_info() {
@@ -122,6 +103,14 @@ WARNING: Older versions of Libreswan could contain known security vulnerabilitie
          See https://libreswan.org/security/ for more information.
          Are you sure you want to install an older version?
 
+EOF
+  fi
+
+  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
+cat <<EOF
+Note: You already have Libreswan version $SWAN_VER installed!
+      If you continue, the same version will be re-installed.
+
 EOF
   fi
 
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index d08e72a..c82a510 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -69,7 +69,7 @@ check_libreswan() {
 cat 1>&2 <<EOF
 Error: Libreswan version '$SWAN_VER' is not supported.
        This script can install one of these versions:
-       3.32, 4.1-4.5 or 4.6
+       3.32, 4.1-4.6
 EOF
       exit 1
       ;;
@@ -88,25 +88,6 @@ Error: This script requires Libreswan already installed.
 EOF
     exit 1
   fi
-
-  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
-cat <<EOF
-You already have Libreswan version $SWAN_VER installed!
-If you continue, the same version will be re-installed.
-
-EOF
-    printf "Do you want to continue anyway? [y/N] "
-    read -r response
-    case $response in
-      [yY][eE][sS]|[yY])
-        echo
-        ;;
-      *)
-        echo "Abort. No changes were made."
-        exit 1
-        ;;
-    esac
-  fi
 }
 
 show_setup_info() {
@@ -131,6 +112,14 @@ WARNING: Older versions of Libreswan could contain known security vulnerabilitie
          See https://libreswan.org/security/ for more information.
          Are you sure you want to install an older version?
 
+EOF
+  fi
+
+  if [ "$swan_ver_old" = "$SWAN_VER" ]; then
+cat <<EOF
+Note: You already have Libreswan version $SWAN_VER installed!
+      If you continue, the same version will be re-installed.
+
 EOF
   fi