Repository: activemq-artemis Updated Branches: refs/heads/master 274e67d67 -> ce84c0cc1
fix ARTEMIS_HOME check in Windows batch script Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/17ebf2db Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/17ebf2db Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/17ebf2db Branch: refs/heads/master Commit: 17ebf2dbaa162ab917c53b819f0e448070b5bc64 Parents: 274e67d Author: Derek Wickern <[email protected]> Authored: Tue Jan 30 11:34:13 2018 -0800 Committer: Howard Gao <[email protected]> Committed: Thu Feb 1 11:25:28 2018 +0800 ---------------------------------------------------------------------- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/17ebf2db/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd ---------------------------------------------------------------------- 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 b6f2d0a..c9d12b5 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 http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/17ebf2db/artemis-distribution/src/main/resources/bin/artemis.cmd ---------------------------------------------------------------------- diff --git a/artemis-distribution/src/main/resources/bin/artemis.cmd b/artemis-distribution/src/main/resources/bin/artemis.cmd index 9573d49..9c82085 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
