From 7c76a7aa37059bcfd4f5ca8c4d3989c67f7ebe38 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Wed, 9 Apr 2025 23:26:08 -0500
Subject: [PATCH] Improve Libreswan check

- If folder /etc/ipsec.d does not exist, don't skip
  Libreswan installation.
---
 vpnsetup_alpine.sh | 1 +
 vpnsetup_amzn.sh   | 1 +
 vpnsetup_centos.sh | 1 +
 vpnsetup_ubuntu.sh | 1 +
 4 files changed, 4 insertions(+)

diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh
index 4c9fa12..42a8309 100755
--- a/vpnsetup_alpine.sh
+++ b/vpnsetup_alpine.sh
@@ -264,6 +264,7 @@ EOF
 
 check_libreswan() {
   check_result=0
+  [ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
   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\).*//')
   ipsec_bin="/usr/local/sbin/ipsec"
diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh
index 2e1a2db..b4f3cec 100755
--- a/vpnsetup_amzn.sh
+++ b/vpnsetup_amzn.sh
@@ -282,6 +282,7 @@ EOF
 
 check_libreswan() {
   check_result=0
+  [ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
   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\).*//')
   ipsec_bin="/usr/local/sbin/ipsec"
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 8440412..9ff599f 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -385,6 +385,7 @@ EOF
 
 check_libreswan() {
   check_result=0
+  [ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
   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\).*//')
   ipsec_bin="/usr/local/sbin/ipsec"
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index 26ddeb3..9d9e42a 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -345,6 +345,7 @@ EOF
 
 check_libreswan() {
   check_result=0
+  [ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
   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\).*//')
   ipsec_bin="/usr/local/sbin/ipsec"