[maven] branch master updated: [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven] branch master updated: [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows

michaelo
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 9989e6a  [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows
9989e6a is described below

commit 9989e6ab6c469b86ef3c74b55d5c5821ba1ccdfe
Author: Rostislav Krasny <[hidden email]>
AuthorDate: Wed Jan 1 20:30:15 2020 +0200

    [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows
   
    The removed 'stripMHome' recursive function is not needed anymore
   
    This closes #307
---
 apache-maven/src/bin/mvn.cmd | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index fd1b21e..693b909 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -60,15 +60,11 @@ echo NB: JAVA_HOME should point to a JDK not a JRE >&2
 goto error
 
 :chkMHome
-set "MAVEN_HOME=%~dp0.."
-if not "%MAVEN_HOME%"=="" goto stripMHome
+set "MAVEN_HOME=%~dp0"
+set "MAVEN_HOME=%MAVEN_HOME:~0,-5%"
+if not "%MAVEN_HOME%"=="" goto checkMCmd
 goto error
 
-:stripMHome
-if not "_%MAVEN_HOME:~-1%"=="_\" goto checkMCmd
-set "MAVEN_HOME=%MAVEN_HOME:~0,-1%"
-goto stripMHome
-
 :checkMCmd
 if exist "%MAVEN_HOME%\bin\mvn.cmd" goto init
 goto error