Skip to content

Commit

Permalink
Update tool scripts to run in windows (#2371) (#2379)
Browse files Browse the repository at this point in the history
(cherry picked from commit 8ccad5c)

Co-authored-by: Peter Nied <[email protected]>
  • Loading branch information
opensearch-trigger-bot[bot] and peternied authored Jan 6, 2023
1 parent b9652fe commit 6bf05ba
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 15 deletions.
13 changes: 8 additions & 5 deletions tools/audit_config_migrater.bat
Original file line number Diff line number Diff line change
@@ -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 %*
13 changes: 8 additions & 5 deletions tools/hash.bat
Original file line number Diff line number Diff line change
@@ -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 %*

13 changes: 8 additions & 5 deletions tools/securityadmin.bat
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6bf05ba

Please sign in to comment.