summaryrefslogtreecommitdiff
path: root/include/conflicts
diff options
context:
space:
mode:
Diffstat (limited to 'include/conflicts')
-rwxr-xr-xinclude/conflicts12
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}"
}
}