From bf7b9165fd725d2bdf45ca7e639b2c91f5ef65bb Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 8 Jan 2015 16:01:16 +0000 Subject: [PATCH 1/2] Allow custom cache dir We are running oh-my-zsh on a shared install and the only issue is each user having a custom cache dir. This will allow us to set the cache dir to ZSH_CACHE_DIR=~/oh-my-zsh/cache/ . --- lib/completion.zsh | 2 +- oh-my-zsh.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/completion.zsh b/lib/completion.zsh index 3a19a4eb..ea6139fd 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -38,7 +38,7 @@ cdpath=(.) # Use caching so that commands like apt and dpkg complete are useable zstyle ':completion::complete:*' use-cache 1 -zstyle ':completion::complete:*' cache-path $ZSH/cache/ +zstyle ':completion::complete:*' cache-path $ZSH_CACHE_DIR # Don't complete uninteresting users zstyle ':completion:*:*:*:users' ignored-patterns \ diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index d75b521c..bc7a8e49 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -14,6 +14,13 @@ if [[ -z "$ZSH_CUSTOM" ]]; then ZSH_CUSTOM="$ZSH/custom" fi +# Set ZSH_CACHE_DIR to the path where cache files sould be created +# or else we will use the default cache/ +if [[ -z "$ZSH_CACHE_DIR" ]]; then + ZSH_CACHE_DIR="$ZSH/cache/" +fi + + # Load all of the config files in ~/oh-my-zsh that end in .zsh # TIP: Add files you don't want in git to .gitignore for config_file ($ZSH/lib/*.zsh); do From ceb42ecdb6296b136e3ead9e6ab53c24a01fedc9 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 8 Jan 2015 16:38:05 +0000 Subject: [PATCH 2/2] Update /home/srj/.oh-my-zsh/cache references --- plugins/last-working-dir/last-working-dir.plugin.zsh | 4 ++-- plugins/zsh_reload/zsh_reload.plugin.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh index bc36c80d..e472578b 100644 --- a/plugins/last-working-dir/last-working-dir.plugin.zsh +++ b/plugins/last-working-dir/last-working-dir.plugin.zsh @@ -4,8 +4,8 @@ # Flag indicating if we've previously jumped to last directory. typeset -g ZSH_LAST_WORKING_DIRECTORY -mkdir -p "$ZSH/cache" -local cache_file="$ZSH/cache/last-working-dir" +mkdir -p $ZSH_CACHE_DIR +local cache_file="$ZSH_CACHE_DIR/last-working-dir" # Updates the last directory once directory is changed. function chpwd() { diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh index 3f44b99c..cde9ebec 100644 --- a/plugins/zsh_reload/zsh_reload.plugin.zsh +++ b/plugins/zsh_reload/zsh_reload.plugin.zsh @@ -1,7 +1,7 @@ # reload zshrc function src() { - local cache="$ZSH/cache" + local cache=$ZSH_CACHE_DIR autoload -U compinit zrecompile compinit -d "$cache/zcomp-$HOST"