From d58b80f2f9e60d3287577480ad78066d44ed530c Mon Sep 17 00:00:00 2001 From: Colin Mollenhour Date: Fri, 15 May 2015 12:04:16 -0400 Subject: [PATCH] Show conflicting file path in error message when globbing is used. --- modman | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modman b/modman index 8abe127..ee94134 100755 --- a/modman +++ b/modman @@ -564,6 +564,9 @@ apply_path () if ! [ -L "$dest" ] && [ $FORCE -eq 0 ]; then echo_b "CONFLICT: $($stat_type "$dest") already exists and is not a symlink:" echo_b " $line" + if [[ "$line" != *"$real"* ]]; then + echo " $($stat_type "$dest") path: $real" + fi echo "(Run with $(bold)--force$(unbold) to force removal of existing files and directories.)" return 1 elif ! [ -L "$dest" ] || [ "$src" != "$(readlink "$dest")" ]; then