diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/feature_request.md | 2 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/support.md | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | plugins/brew/README.md | 20 | ||||
| -rw-r--r-- | plugins/brew/brew.plugin.zsh | 4 | ||||
| -rw-r--r-- | plugins/docker/README.md | 22 | ||||
| -rw-r--r-- | themes/random.zsh-theme | 15 |
7 files changed, 51 insertions, 20 deletions
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 0a8a588db..8c20544c8 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,7 +1,7 @@ --- name: Feature request about: Suggest a feature for Oh My Zsh -labels: 'Type: feature' +labels: 'feature' --- diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md index d2638412e..697f0c0c8 100644 --- a/.github/ISSUE_TEMPLATE/support.md +++ b/.github/ISSUE_TEMPLATE/support.md @@ -1,7 +1,7 @@ --- name: Support about: Request support for any problem you're having with Oh My Zsh -labels: 'Type: support' +labels: 'support' --- @@ -92,7 +92,7 @@ _Note that the plugins are separated by whitespace (spaces, tabs, new lines...). #### Using Plugins -Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are inclued in that particular plugin. +Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin. ### Themes @@ -139,10 +139,10 @@ ZSH_THEME_RANDOM_CANDIDATES=( ) ``` -If you only know which themes you don't like, you can add them similarly to a blacklist: +If you only know which themes you don't like, you can add them similarly to an ignored list: ```shell -ZSH_THEME_RANDOM_BLACKLIST=(pygmalion tjkirch_mod) +ZSH_THEME_RANDOM_IGNORED=(pygmalion tjkirch_mod) ``` ### FAQ diff --git a/plugins/brew/README.md b/plugins/brew/README.md index 44af05225..398d3263c 100644 --- a/plugins/brew/README.md +++ b/plugins/brew/README.md @@ -10,16 +10,16 @@ plugins=(... brew) ## Aliases -| Alias | Command | Description | -|----------|-------------------------------------------------------------|---------------------------------------------------------------------| -| `brewp` | `brew pin` | Pin a specified formula so that it's not upgraded. | -| `brews` | `brew list -1` | List installed formulae or the installed files for a given formula. | -| `brewsp` | `brew list --pinned` | List pinned formulae, or show the version of a given formula. | -| `bubo` | `brew update && brew outdated` | Update Homebrew and all formulae, then list outdated formulae. | -| `bubc` | `brew upgrade && brew cleanup` | Upgrade outdated formulae, then run cleanup. | -| `bubu` | `bubo && bubc` | Do the last two operations above. | -| `bcubo` | `brew update && brew cask outdated` | Update Homebrew and alll formulae, then list outdated casks. | -| `bcubc` | `brew cask reinstall $(brew cask outdated) && brew cleanup` | Update outdated casks, then run cleanup. | +| Alias | Command | Description | +|----------|------------------------------------------------------------- |---------------------------------------------------------------------| +| `brewp` | `brew pin` | Pin a specified formula so that it's not upgraded. | +| `brews` | `brew list -1` | List installed formulae or the installed files for a given formula. | +| `brewsp` | `brew list --pinned` | List pinned formulae, or show the version of a given formula. | +| `bubo` | `brew update && brew outdated` | Update Homebrew and all formulae, then list outdated formulae. | +| `bubc` | `brew upgrade && brew cleanup` | Upgrade outdated formulae, then run cleanup. | +| `bubu` | `bubo && bubc` | Do the last two operations above. | +| `bcubo` | `brew update && brew outdated --cask` | Update Homebrew and all formulae, then list outdated casks. | +| `bcubc` | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup. | ## Completion diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh index fdea76c74..c8b1e3568 100644 --- a/plugins/brew/brew.plugin.zsh +++ b/plugins/brew/brew.plugin.zsh @@ -4,5 +4,5 @@ alias brewsp='brew list --pinned' alias bubo='brew update && brew outdated' alias bubc='brew upgrade && brew cleanup' alias bubu='bubo && bubc' -alias bcubo='brew update && brew cask outdated' -alias bcubc='brew cask reinstall $(brew cask outdated) && brew cleanup' +alias bcubo='brew update && brew outdated --cask' +alias bcubc='brew cask reinstall $(brew outdated --cask) && brew cleanup' diff --git a/plugins/docker/README.md b/plugins/docker/README.md index 241a6a448..fab7aa8f1 100644 --- a/plugins/docker/README.md +++ b/plugins/docker/README.md @@ -10,3 +10,25 @@ plugins=(... docker) A copy of the completion script from the docker/cli git repo: https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker + +## Settings + +By default, the completion doesn't allow option-stacking, meaning if you try to +complete `docker run -it <TAB>` it won't work, because you're _stacking_ the +`-i` and `-t` options. + +[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding +the lines below to your zshrc file**, but be aware of the side effects: + +> This enables Zsh to understand commands like `docker run -it +> ubuntu`. However, by enabling this, this also makes Zsh complete +> `docker run -u<tab>` with `docker run -uapprox` which is not valid. The +> users have to put the space or the equal sign themselves before trying +> to complete. +> +> Therefore, this behavior is disabled by default. To enable it: +> +> ``` +> zstyle ':completion:*:*:docker:*' option-stacking yes +> zstyle ':completion:*:*:docker-*:*' option-stacking yes +> ``` diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme index 6cb7cc579..f0b8e5c18 100644 --- a/themes/random.zsh-theme +++ b/themes/random.zsh-theme @@ -1,3 +1,10 @@ +# Deprecate ZSH_THEME_RANDOM_BLACKLIST +if [[ -n "$ZSH_THEME_RANDOM_BLACKLIST" ]]; then + echo '[oh-my-zsh] ZSH_THEME_RANDOM_BLACKLIST is deprecated. Use `ZSH_THEME_RANDOM_IGNORED` instead.' + ZSH_THEME_RANDOM_IGNORED=($ZSH_THEME_RANDOM_BLACKLIST) + unset ZSH_THEME_RANDOM_BLACKLIST +fi + # Make themes a unique array typeset -Ua themes @@ -11,8 +18,8 @@ else "$ZSH_CUSTOM"/themes/*.zsh-theme(N:t:r) "$ZSH"/themes/*.zsh-theme(N:t:r) ) - # Remove blacklisted themes from the list - for theme in random ${ZSH_THEME_RANDOM_BLACKLIST[@]}; do + # Remove ignored themes from the list + for theme in random ${ZSH_THEME_RANDOM_IGNORED[@]}; do themes=("${(@)themes:#$theme}") done fi @@ -35,4 +42,6 @@ else return 1 fi -echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded" +if [[ -z "$ZSH_THEME_RANDOM_QUIET" ]]; then + echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded" +fi |