fix bat file

Signed-off-by: Stephen Crawford <[email protected]>

tools/install_demo_configuration.bat

@@ -323,17 +323,18 @@ echo plugins.security.system_indices.indices: [".plugins-ml-config", ".plugins-m
 
 setlocal enabledelayedexpansion
 
-:: Check if initialAdminPassword environment variable is set
-if defined initialAdminPassword (
-  set "ADMIN_PASSWORD=!initialAdminPassword!"
+if not "%initialAdminPassword%"=="" (
+  set "ADMIN_PASSWORD=%initialAdminPassword%"
 ) else (
-  :: Read the admin password from the file
-  for /f %%a in ('type "%ADMIN_PASSWORD_FILE%"') do set "ADMIN_PASSWORD=%%a"
-)
-
-if not defined ADMIN_PASSWORD (
-  echo Unable to find the admin password for the cluster. Please set initialAdminPassword or create a file {OPENSEARCH_ROOT}\config\initialAdminPassword.txt with a single line that contains the password.
-  exit /b 1
+  if exist "%OPENSEARCH_CONF_DIR%\opensearch-security\initialAdminPassword.txt" (
+    for /f "delims=" %%a in ('type "%OPENSEARCH_CONF_DIR%\opensearch-security\initialAdminPassword.txt"') do (
+      set "ADMIN_PASSWORD=%%a"
+      goto :password_found
+    )
+  ) else (
+    echo Unable to find the admin password for the cluster. Please set 'initialAdminPassword' or create a file %OPENSEARCH_ROOT%\config\initialAdminPassword.txt with a single line that contains the password.
+    exit /b 1
+  )
 )
 
 :: Use the Hasher script to hash the admin password

tools/install_demo_configuration.sh

@@ -390,12 +390,6 @@ echo 'plugins.security.restapi.roles_enabled: ["all_access", "security_rest_api_
 echo 'plugins.security.system_indices.enabled: true' | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
 echo 'plugins.security.system_indices.indices: [".plugins-ml-config", ".plugins-ml-connector", ".plugins-ml-model-group", ".plugins-ml-model", ".plugins-ml-task", ".plugins-ml-conversation-meta", ".plugins-ml-conversation-interactions", ".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opensearch-notifications-*", ".opensearch-notebooks", ".opensearch-observability", ".ql-datasources", ".opendistro-asynchronous-search-response*", ".replication-metadata-store", ".opensearch-knn-models", ".geospatial-ip2geo-data*", ".opendistro-job-scheduler-lock"]' | $SUDO_CMD tee -a "$OPENSEARCH_CONF_FILE" > /dev/null
 
-# Read the admin password from the file or use the initialAdminPassword if set
-echo "Path is " $(pwd)
-echo "Checking for password file in: " $OPENSEARCH_CONF_DIR/opensearch-security/
-echo "Content of security config dir is:  $(ls $OPENSEARCH_CONF_DIR/opensearch-security/)
-echo "HEAD of password file is: $(head $OPENSEARCH_CONF_DIR/opensearch-security/initialAdminPassword.txt)"
-
 if [[ -n "$initialAdminPassword" ]]; then
   ADMIN_PASSWORD="$initialAdminPassword"
 elif [[ -f "$OPENSEARCH_CONF_DIR/opensearch-security/initialAdminPassword.txt" && -s "$OPENSEARCH_CONF_DIR/opensearch-security/initialAdminPassword.txt" ]]; then
@@ -405,9 +399,6 @@ else
     exit 1
 fi
 
-echo "ADMIN PASSWORD SET TO: $ADMIN_PASSWORD"
-
-
 # Use the Hasher script to hash the admin password
 HASHED_ADMIN_PASSWORD=$(./hash.sh -p "$ADMIN_PASSWORD")