Update tool scripts to run in windows (opensearch-project#2371)

peternied · Jan 6, 2023 · 8ccad5c · 8ccad5c
1 parent 563df8f
commit 8ccad5c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/tools/audit_config_migrater.bat b/tools/audit_config_migrater.bat
@@ -1,16 +1,19 @@
 @echo off
-set SCRIPT_DIR=%~dp0
+set DIR=%~dp0
 
 echo "**************************************************************************"
 echo "** This tool will be deprecated in the next major release of OpenSearch **"
 echo "** https://github.com/opensearch-project/security/issues/1755           **"
 echo "**************************************************************************"
 
-rem comparing to empty string makes this equivalent to bash -v check on env var
-if not "%OPENSEARCH_JAVA_HOME%" == "" (
+if defined OPENSEARCH_JAVA_HOME (
   set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe"
-) else (
+) else if defined JAVA_HOME (
   set BIN_PATH="%JAVA_HOME%\bin\java.exe"
+) else (
+  echo Unable to find java runtime
+  echo OPENSEARCH_JAVA_HOME or JAVA_HOME must be defined
+  exit /b 1
 )
 
-%BIN_PATH% -cp "%SCRIPT_DIR%\..\..\opendistro_security_ssl\*;%SCRIPT_DIR%\..\deps\*;%SCRIPT_DIR%\..\*;%SCRIPT_DIR%\..\..\..\lib\*" org.opensearch.security.tools.AuditConfigMigrater %*
+%BIN_PATH% -cp "%DIR%\..\*;%DIR%\..\..\..\lib\*;%DIR%\..\deps\*" org.opensearch.security.tools.AuditConfigMigrater %*
diff --git a/tools/hash.bat b/tools/hash.bat
@@ -1,17 +1,20 @@
 @echo off
-set SCRIPT_DIR=%~dp0
+set DIR=%~dp0
 
 echo "**************************************************************************"
 echo "** This tool will be deprecated in the next major release of OpenSearch **"
 echo "** https://github.com/opensearch-project/security/issues/1755           **"
 echo "**************************************************************************"
 
-rem comparing to empty string makes this equivalent to bash -v check on env var
-if not "%OPENSEARCH_JAVA_HOME%" == "" (
+if defined OPENSEARCH_JAVA_HOME (
   set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe"
-) else (
+) else if defined JAVA_HOME (
   set BIN_PATH="%JAVA_HOME%\bin\java.exe"
+) else (
+  echo Unable to find java runtime
+  echo OPENSEARCH_JAVA_HOME or JAVA_HOME must be defined
+  exit /b 1
 )
 
-%BIN_PATH% -cp "%SCRIPT_DIR%\..\..\opendistro_security_ssl\*;%SCRIPT_DIR%\..\deps\*;%SCRIPT_DIR%\..\*;%SCRIPT_DIR%\..\..\..\lib\*" org.opensearch.security.tools.Hasher %*
+%BIN_PATH% -cp "%DIR%\..\*;%DIR%\..\..\..\lib\*;%DIR%\..\deps\*" org.opensearch.security.tools.Hasher %*
 
diff --git a/tools/securityadmin.bat b/tools/securityadmin.bat
@@ -1,16 +1,19 @@
 @echo off
-set SCRIPT_DIR=%~dp0
+set DIR=%~dp0
 
 echo "**************************************************************************"
 echo "** This tool will be deprecated in the next major release of OpenSearch **"
 echo "** https://github.com/opensearch-project/security/issues/1755           **"
 echo "**************************************************************************"
 
-rem comparing to empty string makes this equivalent to bash -v check on env var
-if not "%OPENSEARCH_JAVA_HOME%" == "" (
+if defined OPENSEARCH_JAVA_HOME (
   set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe"
-) else (
+) else if defined JAVA_HOME (
   set BIN_PATH="%JAVA_HOME%\bin\java.exe"
+) else (
+  echo Unable to find java runtime
+  echo OPENSEARCH_JAVA_HOME or JAVA_HOME must be defined
+  exit /b 1
 )
 
-%BIN_PATH% -Dorg.apache.logging.log4j.simplelog.StatusLogger.level=OFF -cp "%SCRIPT_DIR%\..\..\opendistro_security-ssl\*;%SCRIPT_DIR%\..\deps\*;%SCRIPT_DIR%\..\*;%SCRIPT_DIR%\..\..\..\lib\*" org.opensearch.security.tools.SecurityAdmin %* 2> nul
+%BIN_PATH% -Dorg.apache.logging.log4j.simplelog.StatusLogger.level=OFF -cp "%DIR%\..\*;%DIR%\..\..\..\lib\*;%DIR%\..\deps\*" org.opensearch.security.tools.SecurityAdmin %* 2> nul