Show conflicting file path in error message when globbing is used.

colinmollenhour · May 15, 2015 · d58b80f · d58b80f
1 parent c45a6b2
commit d58b80f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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