diff options
| -rw-r--r-- | hooks/post-update | 20 | ||||
| -rwxr-xr-x | include/conflicts | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/hooks/post-update b/hooks/post-update index 3ace773..f1308ea 100644 --- a/hooks/post-update +++ b/hooks/post-update @@ -3,27 +3,27 @@ ## It includes configs provided by other packages ## and sets some more static parameters mkdir -p $HOME/var/cache/zsh -mkdir -p $PDIR/zsh/provided +mkdir -p $PKG_DIR/zsh/provided rm -f $HOME/var/cache/zsh/compdump -echo -n > $PDIR/zsh/provided/includes -echo -n > $PDIR/zsh/provided/env +echo -n > $PKG_DIR/zsh/provided/includes +echo -n > $PKG_DIR/zsh/provided/env typeset -a futurepath -for inc in $PDIR/*/provides/zsh/{functions,completions}(N); { +for inc in $PKG_DIR/*/provides/zsh/{functions,completions}(N); { futurepath+=${inc/$HOME/\$HOME} } if [[ -n $futurepath ]] { - echo "fpath=($futurepath \$fpath)" > $PDIR/zsh/provided/env + echo "fpath=($futurepath \$fpath)" > $PKG_DIR/zsh/provided/env } -for inc in $PDIR/*/provides/zsh/functions(*N:t); { - echo "autoload $inc" >> $PDIR/zsh/provided/includes +for inc in $PKG_DIR/*/provides/zsh/functions(*N:t); { + echo "autoload $inc" >> $PKG_DIR/zsh/provided/includes } -for snippet in $PDIR/*/provides/zsh/*(.N); { - echo "source ${snippet/$HOME/\$HOME}" >> $PDIR/zsh/provided/includes +for snippet in $PKG_DIR/*/provides/zsh/*(.N); { + echo "source ${snippet/$HOME/\$HOME}" >> $PKG_DIR/zsh/provided/includes } -cd $PDIR/zsh/etc +cd $PKG_DIR/zsh/etc zcompile functions.zwc functions/* zcompile completions.zwc completions/* 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}" |