Merge pull request #7 from codice/base-updates

updates to lna function to avoid race condition when checking active …

Author: jaymcnallie

entrypoint/global_env.sh

@@ -108,7 +108,22 @@ function isReady {
     fi
     return 0
   else
-    if [ $(${_client} "lna" | tail -n +6 | grep -Ev "${_legacy_wfr_exclusions}" | wc -l | awk '{$1=$1};1') != "0" ]; then
+    # Run client command using piped input (more reliable than command-line args)
+    # The client with command-line args can return "Closed" even when ready
+    local client_output
+    client_output=$(echo "lna" | ${_client} 2>&1)
+    local client_exit_code=$?
+
+    # If client command failed, system is not ready
+    if [ ${client_exit_code} -ne 0 ]; then
+      return 1
+    fi
+
+    # Check if there are any bundles not active (excluding known exclusions)
+    # First grep for actual bundle rows with "Resolved" state, then exclude known fragments
+    local resolved_bundles
+    resolved_bundles=$(echo "${client_output}" | grep "│ Resolved │" | grep -Ev "${_legacy_wfr_exclusions}" | wc -l | awk '{$1=$1};1')
+    if [ "${resolved_bundles}" != "0" ]; then
       return 1
     fi
     return 0

entrypoint/post_start.sh

@@ -13,8 +13,8 @@ echo -e "\nLog file found, continuing..."
 waitForReady
 
 if [ -n "$INSTALL_PROFILE" ]; then
-  echo "Installing $INSTALL_PROFILE profile. This may take some time..." 
-  ${_client} profile:install ${INSTALL_PROFILE}
+  echo "Installing $INSTALL_PROFILE profile. This may take some time..."
+  echo "profile:install ${INSTALL_PROFILE}" | ${_client}
   waitForReady
 fi
 
@@ -24,7 +24,7 @@ if [ -n "$INSTALL_FEATURES" ]; then
   for index in "${!_install_features[@]}"
   do
     echo "Installing: ${_install_features[$index]}"
-    ${_client} "feature:install ${_install_features[$index]}"
+    echo "feature:install ${_install_features[$index]}" | ${_client}
   done
 fi
 
@@ -34,7 +34,7 @@ if [ -n "$UNINSTALL_FEATURES" ]; then
   for index in "${!_uninstall_features[@]}"
   do
     echo "Uninstalling: ${_uninstall_features[$index]}"
-    ${_client} "feature:uninstall ${_uninstall_features[$index]}"
+    echo "feature:uninstall ${_uninstall_features[$index]}" | ${_client}
   done
 fi