fix up rdir names

diff --git a/.zsh/zshenv/00_fpath b/.zsh/zprofile/00_fpath
similarity index 90%
rename from .zsh/zshenv/00_fpath
rename to .zsh/zprofile/00_fpath
index d9779833ca5a4858fccda1c7d2b701b542dd0985..37bd6e51b69ed0621df29366e90e3b60aad19d07 100644 (file)
--- a/.zsh/zshenv/00_fpath
+++ b/.zsh/zprofile/00_fpath
@@ -8,6 +8,6 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-FPATH="$ZDOTDIR/func:$FPATH"
+fpath=($ZDOTDIR/func $fpath)
 
 # vim:ft=zsh

diff --git a/.zsh/zprofile/40_zcompile b/.zsh/zprofile/40_zcompile
index 4ebd4db7e58669a05b74c5d325014c1366527481..0074768415f4c063d2dbba35b8eb343f066f7743 100644 (file)
--- a/.zsh/zprofile/40_zcompile
+++ b/.zsh/zprofile/40_zcompile
@@ -9,8 +9,8 @@
 #
 
 if [ -n "$ZDOTDIR" ]; then
-  command rm -f $ZDOTDIR/**/*.zwc(.N) $ZDOTDIR/**/.*.zwc(.N) $ZVAR/**/*.zwc(.N)
-  for f ($ZDOTDIR/.*(@) $ZDOTDIR/*(.) $ZDOTDIR/**/*(.) $ZVAR/comp-$HOST) \
+  command rm -f $ZDOTDIR/**/*.zwc(.N) $ZDOTDIR/**/.*.zwc(.N) $ZVARDIR/**/*.zwc(.N)
+  for f ($ZDOTDIR/.*(@) $ZDOTDIR/*(.) $ZDOTDIR/**/*(.) $ZVARDIR/comp-$HOST) \
     zcompile $f
 fi
 

diff --git a/.zsh/zshenv/00_rdirs b/.zsh/zshenv/00_rdirs
index 062c011293035b83237052ba24e0bc0b05238c09..b830a956ece491c505d1abd724bd801afcfdb403 100644 (file)
--- a/.zsh/zshenv/00_rdirs
+++ b/.zsh/zshenv/00_rdirs
@@ -8,10 +8,14 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-export VAR_RELATIVE=.var
-export VAR=$HOME/$VAR_RELATIVE
-export ZVAR=$VAR/zsh
-export BIN_RELATIVE=.bin
-export BIN=$HOME/$BIN_RELATIVE
+export VARDIR_REL=.var
+export VARDIR=$HOME/$VARDIR_REL
+export ZVARDIR=$VARDIR/zsh
+
+export BINDIR_REL=.bin
+export BINDIR=$HOME/$BINDIR_REL
+
+export TMPDIR_REL=.tmp
+export TMPDIR=$HOME/$TMPDIR_REL
 
 # vim:ft=zsh

diff --git a/.zsh/zshrc/00_recompile b/.zsh/zshrc/00_recompile
index 05bb0f518ff4ef4f9f13ada3dc2200194cf32966..37c607c69558ccc1253bdaee0c9c1dffee705dff 100644 (file)
--- a/.zsh/zshrc/00_recompile
+++ b/.zsh/zshrc/00_recompile
@@ -8,7 +8,7 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-zrecompile $ZDOTDIR/** $ZVAR/** | while read pre file post; do
+zrecompile $ZDOTDIR/** $ZVARDIR/** | while read pre file post; do
     case "$post" in
       succeeded) rm -f "${file%:}".old;;
       *) :;;

diff --git a/.zsh/zshrc/20_compsys b/.zsh/zshrc/20_compsys
index 76243ca71284445bf47ced6f37accf1f2c74f524..bb4c7c11e5be917291b0403cf2c5d437cd556005 100644 (file)
--- a/.zsh/zshrc/20_compsys
+++ b/.zsh/zshrc/20_compsys
@@ -31,11 +31,11 @@ zmodload zsh/complist
 
 # initialise the completion system
 autoload -U compinit
-compinit -d $VAR/zsh/comp-$HOST
+compinit -d $ZVARDIR/comp-$HOST
 
 # cache results
 zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path $ZVAR/compcache
+zstyle ':completion:*' cache-path $ZVARDIR/compcache
 
 #zstyle ':completion:*' completer _list _expand _complete _ignored _match _correct _approximate _prefix
 zstyle ':completion:*' completer _complete _ignored _match _approximate

diff --git a/.zsh/zshrc/80_history b/.zsh/zshrc/80_history
index 708ea41f0f973edc2e8a76c440bd307e10c15352..4a80f0604d8d0785f52f65d413413b6843c7b79d 100644 (file)
--- a/.zsh/zshrc/80_history
+++ b/.zsh/zshrc/80_history
@@ -8,7 +8,7 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-HISTFILE=$ZVAR/history
+HISTFILE=$ZVARDIR/history
 HISTSIZE=10000
 SAVEHIST=$HISTSIZE
 LISTMAX=1000