From edf25e21839cd0c9da1bdfb8df2ef06d2561e7a7 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 19 Aug 2021 23:00:57 -0500
Subject: [PATCH] Update tests

---
 .github/workflows/cron.yml | 14 ++++++++------
 .github/workflows/main.yml | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 632c24e..9e8ef7d 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -183,7 +183,7 @@ jobs:
           VPN_PASSWORD='your_vpn_password' \
           VPN_DNS_SRV1='1.1.1.1' \
           VPN_DNS_SRV2='1.0.0.1' \
-          sh vpnsetup.sh
+          bash vpnsetup.sh
 
           restart_ipsec
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
@@ -421,12 +421,13 @@ jobs:
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
           for ver in 3.32 4.1 4.2 4.3 4.4; do
+            [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
-          sh vpnup.sh <<ANSWERS
+          "$shc" vpnup.sh <<ANSWERS
           y
           ANSWERS
             restart_ipsec
-            ipsec --version
+            ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
             ipsec status | grep -q ikev2-cp
@@ -586,7 +587,7 @@ jobs:
           VPN_PASSWORD='your_vpn_password' \
           VPN_DNS_SRV1='1.1.1.1' \
           VPN_DNS_SRV2='1.0.0.1' \
-          sh vpnsetup.sh
+          bash vpnsetup.sh
 
           restart_ipsec
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
@@ -823,12 +824,13 @@ jobs:
           os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
           for ver in 3.32 4.1 4.2 4.3 4.4; do
             [ "$ver" = "3.32" ] && [ "$os_ver" = "11" ] && continue
+            [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
-          sh vpnup.sh <<ANSWERS
+          "$shc" vpnup.sh <<ANSWERS
           y
           ANSWERS
             restart_ipsec
-            ipsec --version
+            ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
             ipsec status | grep -q ikev2-cp
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5b669ef..77ca043 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -212,7 +212,7 @@ jobs:
           VPN_PASSWORD='your_vpn_password' \
           VPN_DNS_SRV1='1.1.1.1' \
           VPN_DNS_SRV2='1.0.0.1' \
-          sh vpnsetup.sh
+          bash vpnsetup.sh
 
           restart_ipsec
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
@@ -450,12 +450,13 @@ jobs:
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
           for ver in 3.32 4.1 4.2 4.3 4.4; do
+            [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
-          sh vpnup.sh <<ANSWERS
+          "$shc" vpnup.sh <<ANSWERS
           y
           ANSWERS
             restart_ipsec
-            ipsec --version
+            ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
             ipsec status | grep -q ikev2-cp
@@ -615,7 +616,7 @@ jobs:
           VPN_PASSWORD='your_vpn_password' \
           VPN_DNS_SRV1='1.1.1.1' \
           VPN_DNS_SRV2='1.0.0.1' \
-          sh vpnsetup.sh
+          bash vpnsetup.sh
 
           restart_ipsec
           grep -q "your_ipsec_pre_shared_key" /etc/ipsec.secrets
@@ -852,12 +853,13 @@ jobs:
           os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
           for ver in 3.32 4.1 4.2 4.3 4.4; do
             [ "$ver" = "3.32" ] && [ "$os_ver" = "11" ] && continue
+            [ "$ver" = "4.3" ] && shc=sh || shc=bash
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
-          sh vpnup.sh <<ANSWERS
+          "$shc" vpnup.sh <<ANSWERS
           y
           ANSWERS
             restart_ipsec
-            ipsec --version
+            ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
             ipsec status | grep -q ikev2-cp