Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing issue on Solaris 

- removed use of 'local' for Solaris 11
- switched $() to  ...
This commit is contained in:
Romain Pelisse 2017-04-12 10:15:52 +02:00 committed by rfscholte
parent feb37317e6
commit afbc151906
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
maven-wrapper/mvnw vendored
View File

@ -172,14 +172,18 @@ find_maven_basedir() {
return 1 return 1
fi fi
local basedir="$1" basedir="$1"
local wdir="$1" wdir="$1"
while [ "$wdir" != '/' ] ; do while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir basedir=$wdir
break break
fi fi
wdir=$(cd "$wdir/.."; pwd) # workaround for JBEAP-8937 (on Solaris 10/Sparc)
if [ -d "${wdir}" ]; then
wdir=`cd "$wdir/.."; pwd`
fi
# end of workaround
done done
echo "${basedir}" echo "${basedir}"
} }
@ -196,13 +200,7 @@ if [ -z "$BASE_DIR" ]; then
exit 1; exit 1;
fi fi
# Workaround for JBEAP-8937 (do not change, it may break on Solaris) export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
if [ -z "${MAVEN_PROJECTBASEDIR}" ]; then
export MAVEN_PROJECTBASEDIR=`find_maven_basedir`
fi
# End of fix
echo $MAVEN_PROJECTBASEDIR echo $MAVEN_PROJECTBASEDIR
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"