[MNG-6177] The --file command line option of the Windows and Unix launchers does not work for directory names like "Spaces & Special Char"
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0b9a30f3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0b9a30f3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0b9a30f3 Branch: refs/heads/MNG-6169 Commit: 0b9a30f350f159a190e87c78e520ba7a7ae0642b Parents: 0db5e32 Author: Christian Schulte <schu...@apache.org> Authored: Thu Feb 23 03:14:21 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Fri Feb 24 00:55:29 2017 +0100 ---------------------------------------------------------------------- apache-maven/src/bin/mvn | 6 +++--- apache-maven/src/bin/mvn.cmd | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0b9a30f3/apache-maven/src/bin/mvn ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 95a407d..cfb39b0 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -141,9 +141,9 @@ find_file_argument_basedir() { found_file_switch=0 for arg in "$@"; do if [ ${found_file_switch} -eq 1 ]; then - if [ -f ${arg} ]; then - basedir=$(dirname $(readlink -f "${arg}")) - if [ ! -d ${basedir} ]; then + if [ -f "${arg}" ]; then + basedir=$(dirname "$(readlink -f "${arg}")") + if [ ! -d "${basedir}" ]; then echo "Directory ${basedir} extracted from the -f/--file command-line argument ${arg} does not exist" >&2 exit 1 fi http://git-wip-us.apache.org/repos/asf/maven/blob/0b9a30f3/apache-maven/src/bin/mvn.cmd ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index e527188..c86662b 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -120,7 +120,7 @@ if not exist "%FILE_ARG%" ( echo POM file %FILE_ARG% specified the -f/--file command-line argument does not exist >&2 goto error ) -call :get_directory_from_file %FILE_ARG% +call :get_directory_from_file "%FILE_ARG%" if not exist "%POM_DIR%" ( echo Directory %POM_DIR% extracted from the -f/--file command-line argument %FILE_ARG% does not exist >&2 goto error
