Resolve windows opensearch-env.bat having variable delayed expansion …

…issues on OPENSEARCH_HOME assignment introduced in opensearch-project#6956 (opensearch-project#7080) * Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment Signed-off-by: Peter Zhu <[email protected]> * Remove changelog entry Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]>
austintlee · Apr 28, 2023 · 274c67e · 274c67e
1 parent bb19ba8
commit 274c67e
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/distribution/src/bin/opensearch-env.bat b/distribution/src/bin/opensearch-env.bat
@@ -3,18 +3,21 @@ set SCRIPT=%0
 rem determine OpenSearch home; to do this, we strip from the path until we
 rem find bin, and then strip bin (there is an assumption here that there is no
 rem nested directory under bin also named bin)
-if not defined OPENSEARCH_HOME (
-  for %%I in (%SCRIPT%) do set OPENSEARCH_HOME=%%~dpI
-
-  :opensearch_home_loop
-  for %%I in ("%OPENSEARCH_HOME:~1,-1%") do set DIRNAME=%%~nxI
-  if not "%DIRNAME%" == "bin" (
-    for %%I in ("%OPENSEARCH_HOME%..") do set OPENSEARCH_HOME=%%~dpfI
-    goto opensearch_home_loop
-  )
+if not defined OPENSEARCH_HOME goto opensearch_home_start_setup
+goto opensearch_home_done_setup
+
+:opensearch_home_start_setup
+for %%I in (%SCRIPT%) do set OPENSEARCH_HOME=%%~dpI
+
+:opensearch_home_loop
+for %%I in ("%OPENSEARCH_HOME:~1,-1%") do set DIRNAME=%%~nxI
+if not "%DIRNAME%" == "bin" (
   for %%I in ("%OPENSEARCH_HOME%..") do set OPENSEARCH_HOME=%%~dpfI
+  goto opensearch_home_loop
 )
+for %%I in ("%OPENSEARCH_HOME%..") do set OPENSEARCH_HOME=%%~dpfI
 
+:opensearch_home_done_setup
 rem now set the classpath
 set OPENSEARCH_CLASSPATH=!OPENSEARCH_HOME!\lib\*