From e4a7c0d5eb88b70e04e5980f347417431b0f5524 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 10 Sep 2008 13:23:30 +0200 Subject: include/conflicts: Display multiple files properly --- include/conflicts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include') 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}" } } -- cgit v1.2.3