Merge branch 'master' of github.com:robbyrussell/oh-my-zsh into robby-master

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 \

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

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

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"
+mkdir -p $ZSH_CACHE_DIR
-local cache_file="$ZSH/cache/last-working-dir"
+local cache_file="$ZSH_CACHE_DIR/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {

plugins/wp-cli/wp-cli.plugin.zsh

@@ -52,19 +52,19 @@ alias wpmlo='wp menu location'
 # Option
 
 # Plugin
-alias wppa='activate'
+alias wppa='wp plugin activate'
-alias wppda='deactivate'
+alias wppda='wp plugin deactivate'
-alias wppd='delete'
+alias wppd='wp plugin delete'
-alias wppg='get'
+alias wppg='wp plugin get'
-alias wppi='install'
+alias wppi='wp plugin install'
-alias wppis='is-installed'
+alias wppis='wp plugin is-installed'
-alias wppl='list'
+alias wppl='wp plugin list'
-alias wppp='path'
+alias wppp='wp plugin path'
-alias wpps='search'
+alias wpps='wp plugin search'
-alias wppst='status'
+alias wppst='wp plugin status'
-alias wppt='toggle'
+alias wppt='wp plugin toggle'
-alias wppu='uninstall'
+alias wppu='wp plugin uninstall'
-alias wppu='update'
+alias wppu='wp plugin update'
 
 # Post
 alias wppoc='wp post create'

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"
 

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
 }