diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh index 9d64ff6..0a9ba1e 100755 --- a/extras/ikev2setup.sh +++ b/extras/ikev2setup.sh @@ -103,13 +103,10 @@ EOF esac if [ "$os_type" = "alpine" ]; then os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.20" ] && [ "$os_ver" != "3.21" ]; then - exiterr "This script only supports Alpine Linux 3.20/3.21." - fi else os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9') if [ "$os_ver" = 8 ] || [ "$os_ver" = 9 ] || [ "$os_ver" = "stretchsid" ] \ - || [ "$os_ver" = "bustersid" ]; then + || [ "$os_ver" = "bustersid" ] || [ -z "$os_ver" ]; then cat 1>&2 <= 10 or Ubuntu >= 20.04. This version of Ubuntu/Debian is too old and not supported. @@ -172,7 +169,7 @@ confirm_or_abort() { show_header() { cat <<'EOF' -IKEv2 Script Copyright (c) 2020-2025 Lin Song 12 May 2025 +IKEv2 Script Copyright (c) 2020-2025 Lin Song 1 Sep 2025 EOF } diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh index 10e1324..f84f3d8 100755 --- a/extras/vpnupgrade.sh +++ b/extras/vpnupgrade.sh @@ -89,12 +89,7 @@ EOF exit 1 ;; esac - if [ "$os_type" = "alpine" ]; then - os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.20" ] && [ "$os_ver" != "3.21" ]; then - exiterr "This script only supports Alpine Linux 3.20/3.21." - fi - else + if [ "$os_type" != "alpine" ]; then os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9') if [ "$os_ver" = 8 ] || [ "$os_ver" = 9 ] || [ "$os_ver" = "stretchsid" ] \ || [ "$os_ver" = "bustersid" ] || [ -z "$os_ver" ]; then diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh index f523ff4..ba301ac 100755 --- a/extras/vpnupgrade_alpine.sh +++ b/extras/vpnupgrade_alpine.sh @@ -51,9 +51,6 @@ check_os() { ;; esac os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.20" ] && [ "$os_ver" != "3.21" ]; then - exiterr "This script only supports Alpine Linux 3.20/3.21." - fi } check_libreswan() { diff --git a/vpnsetup.sh b/vpnsetup.sh index 0460b73..2685f88 100755 --- a/vpnsetup.sh +++ b/vpnsetup.sh @@ -123,8 +123,8 @@ EOF esac if [ "$os_type" = "alpine" ]; then os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.20" ] && [ "$os_ver" != "3.21" ]; then - exiterr "This script only supports Alpine Linux 3.20/3.21." + if [ "$os_ver" != "3.21" ] && [ "$os_ver" != "3.22" ]; then + exiterr "This script only supports Alpine Linux 3.21/3.22." fi else os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9') diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh index 1af2512..dedca7c 100755 --- a/vpnsetup_alpine.sh +++ b/vpnsetup_alpine.sh @@ -70,8 +70,8 @@ check_os() { ;; esac os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2) - if [ "$os_ver" != "3.20" ] && [ "$os_ver" != "3.21" ]; then - exiterr "This script only supports Alpine Linux 3.20/3.21." + if [ "$os_ver" != "3.21" ] && [ "$os_ver" != "3.22" ]; then + exiterr "This script only supports Alpine Linux 3.21/3.22." fi }