diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh index 88b49df..da3d9a4 100755 --- a/vpnsetup_alpine.sh +++ b/vpnsetup_alpine.sh @@ -204,6 +204,10 @@ get_swan_ver() { check_libreswan() { ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null) swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//') + if [ -n "$swan_ver_old" ] && [ "$(find /usr/local/sbin/ipsec -mmin -10080)" ]; then + return 0 + fi + get_swan_ver [ "$swan_ver_old" = "$SWAN_VER" ] } @@ -221,7 +225,7 @@ get_libreswan() { /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xzf "$swan_file" && /bin/rm -f "$swan_file" else - bigecho "Libreswan $SWAN_VER is already installed, skipping..." + bigecho "Libreswan $swan_ver_old is already installed, skipping..." fi } @@ -552,7 +556,6 @@ vpnsetup() { install_vpn_pkgs install_fail2ban get_ikev2_script - get_swan_ver get_libreswan install_libreswan create_vpn_config diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh index 8a3afa3..b944916 100755 --- a/vpnsetup_amzn.sh +++ b/vpnsetup_amzn.sh @@ -204,6 +204,10 @@ get_swan_ver() { check_libreswan() { ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null) swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//') + if [ -n "$swan_ver_old" ] && [ "$(find /usr/local/sbin/ipsec -mmin -10080)" ]; then + return 0 + fi + get_swan_ver [ "$swan_ver_old" = "$SWAN_VER" ] } @@ -221,7 +225,7 @@ get_libreswan() { /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xzf "$swan_file" && /bin/rm -f "$swan_file" else - bigecho "Libreswan $SWAN_VER is already installed, skipping..." + bigecho "Libreswan $swan_ver_old is already installed, skipping..." fi } @@ -566,7 +570,6 @@ vpnsetup() { install_vpn_pkgs_2 install_fail2ban get_ikev2_script - get_swan_ver get_libreswan install_libreswan create_vpn_config diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh index 8ccec90..8385d10 100755 --- a/vpnsetup_centos.sh +++ b/vpnsetup_centos.sh @@ -261,6 +261,10 @@ get_swan_ver() { check_libreswan() { ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null) swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//') + if [ -n "$swan_ver_old" ] && [ "$(find /usr/local/sbin/ipsec -mmin -10080)" ]; then + return 0 + fi + get_swan_ver [ "$swan_ver_old" = "$SWAN_VER" ] } @@ -278,7 +282,7 @@ get_libreswan() { /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xzf "$swan_file" && /bin/rm -f "$swan_file" else - bigecho "Libreswan $SWAN_VER is already installed, skipping..." + bigecho "Libreswan $swan_ver_old is already installed, skipping..." fi } @@ -681,7 +685,6 @@ vpnsetup() { install_vpn_pkgs_3 install_fail2ban get_ikev2_script - get_swan_ver get_libreswan install_libreswan create_vpn_config diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh index 674581b..c082293 100755 --- a/vpnsetup_ubuntu.sh +++ b/vpnsetup_ubuntu.sh @@ -244,6 +244,10 @@ get_swan_ver() { check_libreswan() { ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null) swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//') + if [ -n "$swan_ver_old" ] && [ "$(find /usr/local/sbin/ipsec -mmin -10080)" ]; then + return 0 + fi + get_swan_ver [ "$swan_ver_old" = "$SWAN_VER" ] } @@ -261,7 +265,7 @@ get_libreswan() { /bin/rm -rf "/opt/src/libreswan-$SWAN_VER" tar xzf "$swan_file" && /bin/rm -f "$swan_file" else - bigecho "Libreswan $SWAN_VER is already installed, skipping..." + bigecho "Libreswan $swan_ver_old is already installed, skipping..." fi } @@ -669,7 +673,6 @@ vpnsetup() { install_vpn_pkgs install_fail2ban get_ikev2_script - get_swan_ver get_libreswan install_libreswan create_vpn_config