You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/09/04 23:05:34 UTC
maven git commit: Support directories with spaces in mvn
Repository: maven
Updated Branches:
refs/heads/master a2eb2fe3e -> f0cc5e8af
Support directories with spaces in mvn
find_maven_basedir() doesn't handle a current working directory containing spaces; this patch fixes this behaviour.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f0cc5e8a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f0cc5e8a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f0cc5e8a
Branch: refs/heads/master
Commit: f0cc5e8af91fc6a812861fbb0494aeed88f09314
Parents: a2eb2fe
Author: Stephen Kitt <st...@sk2.org>
Authored: Tue Sep 1 21:16:47 2015 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Fri Sep 4 23:01:14 2015 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f0cc5e8a/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 4940a52..080db3e 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -197,10 +197,10 @@ fi
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
- local basedir=$(pwd)
- local wdir=$(pwd)
+ local basedir="$(pwd)"
+ local wdir="$(pwd)"
while [ "$wdir" != '/' ] ; do
- wdir=$(cd "$wdir/.."; pwd)
+ wdir="$(cd "$wdir/.."; pwd)"
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
@@ -216,7 +216,7 @@ concat_lines() {
fi
}
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-$(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