You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/07/19 20:05:04 UTC
[maven] 01/01: Remove env var usage
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7189
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c097fb07cab4bf8b5df6b54ac8fad2bcd0cb9dc1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 19 22:04:55 2021 +0200
Remove env var usage
---
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/shared/init.cmd | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index 25e22d3..e369c6b 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -114,7 +114,7 @@ concat_lines() {
fi
}
-MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir "$@"`}"
+MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
# For Cygwin, switch project base directory path to Windows format before
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index 14ec5ba..0ce4f30 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -7,9 +7,6 @@ set MAVEN_CMD_LINE_ARGS=%*
@REM Find the project basedir, i.e., the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
-set "MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%"
-if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
set "EXEC_DIR=%CD%"
set "WDIR=%EXEC_DIR%"