From bf7b9165fd725d2bdf45ca7e639b2c91f5ef65bb Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 8 Jan 2015 16:01:16 +0000 Subject: [PATCH 1/5] 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 3a19a4eba..ea6139fde 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 d75b521c7..bc7a8e496 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/5] 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 bc36c80db..e472578b0 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 3f44b99c6..cde9ebeca 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" From 3c4998319ab0796221a70ba19437629afb18ac31 Mon Sep 17 00:00:00 2001 From: Yu Jiang Date: Mon, 12 Jan 2015 21:57:00 +0800 Subject: [PATCH 3/5] Update django.plugin.zsh activate django plugin on command "django-admin" --- plugins/django/django.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh index aaaa7d21d..2e9ce1c52 100644 --- a/plugins/django/django.plugin.zsh +++ b/plugins/django/django.plugin.zsh @@ -236,5 +236,6 @@ _managepy() { compdef _managepy manage.py compdef _managepy django +compdef _managepy django-admin compdef _managepy django-admin.py compdef _managepy django-manage From 3abc2a4375ef2b623aa579d991aa802f3746de52 Mon Sep 17 00:00:00 2001 From: Luis Martins Date: Mon, 12 Jan 2015 17:26:04 +0000 Subject: [PATCH 4/5] Fix Plugin commands --- plugins/wp-cli/wp-cli.plugin.zsh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh index 5d9551e24..ac430b7a2 100644 --- a/plugins/wp-cli/wp-cli.plugin.zsh +++ b/plugins/wp-cli/wp-cli.plugin.zsh @@ -52,19 +52,19 @@ alias wpmlo='wp menu location' # Option # Plugin -alias wppa='activate' -alias wppda='deactivate' -alias wppd='delete' -alias wppg='get' -alias wppi='install' -alias wppis='is-installed' -alias wppl='list' -alias wppp='path' -alias wpps='search' -alias wppst='status' -alias wppt='toggle' -alias wppu='uninstall' -alias wppu='update' +alias wppa='wp plugin activate' +alias wppda='wp plugin deactivate' +alias wppd='wp plugin delete' +alias wppg='wp plugin get' +alias wppi='wp plugin install' +alias wppis='wp plugin is-installed' +alias wppl='wp plugin list' +alias wppp='wp plugin path' +alias wpps='wp plugin search' +alias wppst='wp plugin status' +alias wppt='wp plugin toggle' +alias wppu='wp plugin uninstall' +alias wppu='wp plugin update' # Post alias wppoc='wp post create' From 5cb0ed98d1e5f0119e7871e21948a6b931f14a78 Mon Sep 17 00:00:00 2001 From: "Nicholas T." Date: Thu, 15 Jan 2015 09:09:41 +1000 Subject: [PATCH 5/5] Fast installation time by shallow copying git repo Use `--depth=1` to clone just the lastest version rather than every version in git. --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index a53ac48ab..69213d4a3 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -hash git >/dev/null 2>&1 && env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { +hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { echo "git not installed" exit }