apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-18 17:37:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use MVND_HOME instead of MAVEN_HOME to not mess the stock maven usage, fixes #7

Browse Source
This commit is contained in:
Guillaume Nodet
2019-10-01 16:46:26 +02:00
parent 3714bdbfe2
commit 37152ad2db
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/distro/bin/mvnd
View File

@@ -63,17 +63,17 @@ done
saveddir=`pwd` saveddir=`pwd`
MAVEN_HOME=`dirname "$PRG"`/.. MVND_HOME=`dirname "$PRG"`/..
# make it fully qualified # make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` MVND_HOME=`cd "$MVND_HOME" && pwd`
cd "$saveddir" cd "$saveddir"
# For Cygwin, ensure paths are in Unix format before anything is touched # For Cygwin, ensure paths are in Unix format before anything is touched
if $cygwin ; then if $cygwin ; then
[ -n "$MAVEN_HOME" ] && [ -n "$MVND_HOME" ] &&
MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"` MVND_HOME=`cygpath --unix "$MVND_HOME"`
[ -n "$JAVA_HOME" ] && [ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"` JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] && [ -n "$CLASSPATH" ] &&
@@ -82,8 +82,8 @@ fi
# For MinGW, ensure paths are in Unix format before anything is touched # For MinGW, ensure paths are in Unix format before anything is touched
if $mingw ; then if $mingw ; then
[ -n "$MAVEN_HOME" ] && [ -n "$MVND_HOME" ] &&
MAVEN_HOME=`(cd "$MAVEN_HOME"; pwd)` MVND_HOME=`(cd "$MVND_HOME"; pwd)`
[ -n "$JAVA_HOME" ] && [ -n "$JAVA_HOME" ] &&
JAVA_HOME=`(cd "$JAVA_HOME"; pwd)` JAVA_HOME=`(cd "$JAVA_HOME"; pwd)`
# TODO classpath? # TODO classpath?
@@ -102,14 +102,14 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1 exit 1
fi fi
DAEMON_JAR=`echo "${MAVEN_HOME}"/lib/ext/*.jar "${MAVEN_HOME}"/lib/*.jar` DAEMON_JAR=`echo "${MVND_HOME}"/lib/ext/*.jar "${MVND_HOME}"/lib/*.jar`
DAEMON_JAR=$(echo $DAEMON_JAR | sed -e 's/ /:/g') DAEMON_JAR=$(echo $DAEMON_JAR | sed -e 's/ /:/g')
DAEMON_LAUNCHER=org.jboss.fuse.mvnd.daemon.Client DAEMON_LAUNCHER=org.jboss.fuse.mvnd.daemon.Client
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
if $cygwin ; then if $cygwin ; then
[ -n "$MAVEN_HOME" ] && [ -n "$MVND_HOME" ] &&
MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"` MVND_HOME=`cygpath --path --windows "$MVND_HOME"`
[ -n "$JAVA_HOME" ] && [ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$CLASSPATH" ] && [ -n "$CLASSPATH" ] &&
@@ -193,8 +193,8 @@ exec "$JAVACMD" \
$MAVEN_OPTS \ $MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \ $MAVEN_DEBUG_OPTS \
-classpath "${DAEMON_JAR}" \ -classpath "${DAEMON_JAR}" \
"-Dlogback.configurationFile=${MAVEN_HOME}/conf/logging/logback.xml" \ "-Dlogback.configurationFile=${MVND_HOME}/conf/logging/logback.xml" \
"-Dmaven.home=${MAVEN_HOME}" \ "-Dmaven.home=${MVND_HOME}" \
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \ "-Dlibrary.jansi.path=${MVND_HOME}/lib/jansi-native" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${DAEMON_LAUNCHER} -T1C --builder smart "$@" ${DAEMON_LAUNCHER} -T1C --builder smart "$@"