From 6016131280ce5f24cc53fa7989026f593f4d2d4f Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 28 Nov 2023 22:59:49 +0100
Subject: [PATCH] Ensure we also check the last port

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/api.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/advanced/Scripts/api.sh b/advanced/Scripts/api.sh
index b50e416a..2952fb43 100755
--- a/advanced/Scripts/api.sh
+++ b/advanced/Scripts/api.sh
@@ -26,16 +26,18 @@ TestAPIAvailability() {
     port="${ports%%,*}"
 
     # Iterate over comma separated list of ports
-    while [ "${port}" != "${ports}" ]; do
+    while [ -n "${ports}" ]; do
         # if the port ends with an "s", it is a secure connection
         if [ "${port#"${port%?}"}" = "s" ]; then
             # remove the "s" from the port
             API_PROT="https"
             API_PORT="${port%?}"
         elif [ "${port#"${port%?}"}" = "r" ]; then
-            # Ignore this port
+            # Ignore this port, the client may not be able to follow the
+            # redirected target when FTL is not used as local resolver
             API_PORT="0"
         else
+            # otherwise it is an insecure (plain HTTP) connection
             API_PROT="http"
             API_PORT="${port}"
         fi
@@ -50,8 +52,9 @@ TestAPIAvailability() {
             API_URL="${API_PROT}://localhost:${API_PORT}/api"
             availabilityResonse=$(curl -skS -o /dev/null -w "%{http_code}" "${API_URL}/auth")
 
-            # test if http status code was 200 (OK), 308 (redirect, we follow) 401 (authentication required)
+            # Test if http status code was 200 (OK), 308 (redirect, we follow) 401 (authentication required)
             if [ ! "${availabilityResonse}" = 200 ] && [ ! "${availabilityResonse}" = 308 ] && [ ! "${availabilityResonse}" = 401 ]; then
+                # API is not available at this port/protocol combination
                 API_PORT="0"
             else
                 # API is available at this port/protocol combination
@@ -59,9 +62,9 @@ TestAPIAvailability() {
             fi
         fi
 
-        # remove the first port from the list
+        # If the loop has not been broken, remove the first port from the list
+        # and get the next port
         ports="${ports#*,}"
-        # get the next port
         port="${ports%%,*}"
     done
 
@@ -192,3 +195,6 @@ secretRead() {
     # restore original terminal settings
     stty "${stty_orig}"
 }
+
+
+TestAPIAvailability