diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2016-11-22 14:50:36 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2016-11-22 14:50:36 -0700 |
| commit | 16f191ab62615046b93e04a2ca73eab6a5f9f45a (patch) | |
| tree | 7c926100d0ae2a5693b30a8f8dca74efa84344fa /plugins | |
| parent | cd03efc2e5abc2925a0fe4e17f900bae0858b451 (diff) | |
| parent | 3477ff25274fa75bd9e6110f391f6ad98ca2af72 (diff) | |
| download | zsh-16f191ab62615046b93e04a2ca73eab6a5f9f45a.tar.gz zsh-16f191ab62615046b93e04a2ca73eab6a5f9f45a.tar.bz2 zsh-16f191ab62615046b93e04a2ca73eab6a5f9f45a.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/brew/brew.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/dircycle/dircycle.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/node/node.plugin.zsh | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh index d4289c98e..6fb7f3453 100644 --- a/plugins/brew/brew.plugin.zsh +++ b/plugins/brew/brew.plugin.zsh @@ -3,7 +3,7 @@ alias bubo='brew update && brew outdated' alias bubc='brew upgrade && brew cleanup' alias bubu='bubo && bubc' -if mkdir "$ZSH_CACHE_DIR/.brew-completion-message" 2>/dev/null; then +if command mkdir "$ZSH_CACHE_DIR/.brew-completion-message" 2>/dev/null; then print -P '%F{yellow}'Oh My Zsh brew plugin: cat <<-'EOF' diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh index 2f32277cf..8c58cab4c 100644 --- a/plugins/dircycle/dircycle.plugin.zsh +++ b/plugins/dircycle/dircycle.plugin.zsh @@ -9,6 +9,8 @@ # pushd -N: start counting from right of `dirs' output switch-to-dir () { + [[ ${#dirstack} -eq 0 ]] && return + while ! builtin pushd -q $1 &>/dev/null; do # We found a missing directory: pop it out of the dir stack builtin popd -q $1 diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 178f1deb2..9d8e4174a 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -237,4 +237,4 @@ alias gupv='git pull --rebase -v' alias glum='git pull upstream master' alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' -alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip--"' +alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"' diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh index e2f18a032..e196662c7 100644 --- a/plugins/node/node.plugin.zsh +++ b/plugins/node/node.plugin.zsh @@ -2,5 +2,5 @@ # TODO: Make the section part easier to use. function node-docs { local section=${1:-all} - open_command "http://nodejs.org/docs/$(node --version)/api/$section.html" + open_command "https://nodejs.org/docs/$(node --version)/api/$section.html" } |