diff options
author | Daniel Friesel <derf@derf.homelinux.org> | 2008-09-10 13:23:30 +0200 |
---|---|---|
committer | Daniel Friesel <derf@derf.homelinux.org> | 2008-09-10 13:23:30 +0200 |
commit | e4a7c0d5eb88b70e04e5980f347417431b0f5524 (patch) | |
tree | 8a55cf81cf097a07ad50fd0a53baadeeafab9777 | |
parent | 65d844fe103cb4477c3e412862394c650310ae5f (diff) |
include/conflicts: Display multiple files properly
-rwxr-xr-x | include/conflicts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/conflicts b/include/conflicts index 12d916d..d2af1a0 100755 --- a/include/conflicts +++ b/include/conflicts @@ -1,8 +1,8 @@ #!/usr/bin/env zsh ## vim:ft=zsh -typeset file dir conflict i +typeset file dir i typeset PDIR=$HOME/packages -typeset -a sfpath spath +typeset -a sfpath spath conflict is_in_path () { typeset -i ret=1 @@ -27,15 +27,15 @@ for i in ${path:#/home/derf*}; { } for file in $PDIR/{*/provides/zsh/completions/*(N),zsh/etc/completions/*(N)}; { - conflict=$(is_in_path ${file:t} $sfpath) + conflict=($(is_in_path ${file:t} $sfpath)) if (( ? == 0 )) { - echo "conflict: $file <-> $conflict" + echo "conflict: $file <-> ${(j:, :)conflict}" } } for file in $PDIR/*/bin/*(N); { - conflict=$(is_in_path ${file:t} $spath) + conflict=($(is_in_path ${file:t} $spath)) if (( ? == 0 )) { - echo "conflict: $file <-> $conflict" + echo "conflict: $file <-> ${(j:, :)conflict}" } } |