summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-04-29 15:51:50 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2009-04-29 15:51:50 +0200
commitab31dce7a2e7c0e5ed2865935c1fb80941c5b5a3 (patch)
tree176d0ac20e3c7c813afa00612c3835cbeb825645 /include
parentd64c80b1d2184ab4f9f388dbae9a525bcc0bf487 (diff)
pkg update: Use PKG_DIR instead of PDIR
Diffstat (limited to 'include')
-rwxr-xr-xinclude/conflicts6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conflicts b/include/conflicts
index c2f4c62..b42e156 100755
--- a/include/conflicts
+++ b/include/conflicts
@@ -8,7 +8,7 @@
autoload check_com
typeset file dir alias
-typeset PDIR=$HOME/packages
+typeset PKG_DIR=$HOME/packages
typeset -a sfpath spath conflict
is_in_path () {
@@ -28,14 +28,14 @@ is_in_path () {
sfpath=(${fpath:#$HOME*})
spath=(${path:#$HOME*})
-for file in $PDIR/{*/provides/zsh/completions/*(N),zsh/etc/completions/*(N)}; {
+for file in $PKG_DIR/{*/provides/zsh/completions/*(N),zsh/etc/completions/*(N)}; {
conflict=($(is_in_path ${file:t} $sfpath))
if (( ? == 0 )) {
echo "conflict: $file <-> ${(j:, :)conflict}"
}
}
-for file in $PDIR/*/bin/*(N); {
+for file in $PKG_DIR/*/bin/*(N); {
conflict=($(is_in_path ${file:t} $spath))
if (( ? == 0 )) {
echo "conflict: $file <-> ${(j:, :)conflict}"