From 17ebf2dbaa162ab917c53b819f0e448070b5bc64 Mon Sep 17 00:00:00 2001 From: Derek Wickern Date: Tue, 30 Jan 2018 11:34:13 -0800 Subject: [PATCH] fix ARTEMIS_HOME check in Windows batch script --- .../org/apache/activemq/artemis/cli/commands/bin/artemis.cmd | 5 +---- artemis-distribution/src/main/resources/bin/artemis.cmd | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd index b6f2d0abe8..c9d12b5d53 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd @@ -19,10 +19,7 @@ rem under the License. setlocal if NOT "%ARTEMIS_INSTANCE%"=="" goto CHECK_ARTEMIS_INSTANCE -PUSHD . -CD %~dp0.. -set ARTEMIS_INSTANCE="%CD%" -POPD +set ARTEMIS_INSTANCE="%~dp0.." :CHECK_ARTEMIS_INSTANCE if exist %ARTEMIS_INSTANCE%\bin\artemis.cmd goto CHECK_JAVA diff --git a/artemis-distribution/src/main/resources/bin/artemis.cmd b/artemis-distribution/src/main/resources/bin/artemis.cmd index 9573d494f7..9c820850d0 100755 --- a/artemis-distribution/src/main/resources/bin/artemis.cmd +++ b/artemis-distribution/src/main/resources/bin/artemis.cmd @@ -19,10 +19,7 @@ rem under the License. setlocal if NOT "%ARTEMIS_HOME%"=="" goto CHECK_ARTEMIS_HOME -PUSHD . -CD %~dp0.. -set ARTEMIS_HOME="%CD%" -POPD +set ARTEMIS_HOME="%~dp0.." :CHECK_ARTEMIS_HOME if exist %ARTEMIS_HOME%\bin\artemis.cmd goto CHECK_JAVA