zsh: define and use ZSH_CACHE

diff --git a/zsh/lib/completion.zsh b/zsh/lib/completion.zsh
index 13d98cd3fe5f2e7412af58da6855b68b5e476bc2..d57002840c43f5dff360969ef994668fa3188ef6 100644 (file)
--- a/zsh/lib/completion.zsh
+++ b/zsh/lib/completion.zsh
@@ -41,9 +41,8 @@ hosts=(
 zstyle ':completion:*:hosts' hosts $hosts
 
 # Use caching so that commands like apt and dpkg complete are useable
-[[ -d "$XDG_CACHE_HOME/zsh" ]] || mkdir -p "$XDG_CACHE_HOME/zsh"
 zstyle ':completion::complete:*' use-cache 1
-zstyle ':completion::complete:*' cache-path $XDG_CACHE_HOME/zsh
+zstyle ':completion::complete:*' cache-path $ZSH_CACHE
 
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \

diff --git a/zshrc b/zshrc
index 2e6048a159e5b72707943443366467eb524e8349..6babf77fcb22c26e51a952a3abed5ce960632b16 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,8 @@
 # Path to config files
 ZSH=$XDG_CONFIG_HOME/zsh
+ZSH_CACHE=$XDG_CACHE_HOME/zsh
 [[ ! -d "$ZSH" ]] && echo "Missing config dir: '$ZSH'" && return
+[[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return
 
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
@@ -18,8 +20,8 @@ typeset -U fpath    # make fpath a unique array
 autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
 
 # initialise completion
-[[ -d "$XDG_CACHE_HOME/zsh" ]] || mkdir -p "$XDG_CACHE_HOME/zsh"
-autoload -U compinit; compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
+[[ -d "$ZSH_CACHE" ]] || mkdir -p "$ZSH_CACHE"
+autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
 # miscelaneous options
 setopt extendedglob