From 78bf3dd9b2dc25fe14dbdb9ec8ab2b29e05f6237 Mon Sep 17 00:00:00 2001 From: Eddie Dunn Date: Sun, 7 Feb 2016 21:31:25 +0100 Subject: [PATCH 01/11] pylint.plugin.zsh: Remove include-ids=y The flag `--include-ids` is soon to be deprecated for Pylint. This pull request removes that option from pylint-quick --- plugins/pylint/pylint.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pylint/pylint.plugin.zsh b/plugins/pylint/pylint.plugin.zsh index 6760c67b0..57c7c0ac5 100644 --- a/plugins/pylint/pylint.plugin.zsh +++ b/plugins/pylint/pylint.plugin.zsh @@ -1,3 +1,3 @@ # Aliases -alias pylint-quick='pylint --reports=n --include-ids=y' -compdef _pylint-quick pylint-quick='pylint --reports=n --include-ids=y' \ No newline at end of file +alias pylint-quick='pylint --reports=n' +compdef _pylint-quick pylint-quick='pylint --reports=n' From db39afe95bab90b8f312a925eb849a64f10141f5 Mon Sep 17 00:00:00 2001 From: Glenn / devalias Date: Tue, 9 Feb 2016 15:43:17 +1100 Subject: [PATCH 02/11] Update _brew to match latest Updated _brew to match latest in https://github.com/Homebrew/homebrew/blob/master/Library/Contributions/brew_zsh_completion.zsh --- plugins/brew/_brew | 56 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/plugins/brew/_brew b/plugins/brew/_brew index 4c99a383a..5a5bd6b21 100644 --- a/plugins/brew/_brew +++ b/plugins/brew/_brew @@ -1,7 +1,13 @@ #compdef brew #autoload -# imported from the latest homebrew contributions +# imported from https://github.com/Homebrew/homebrew/blob/master/Library/Contributions/brew_zsh_completion.zsh + +# Brew ZSH completion function +# Drop this somewhere in your $fpath (like /usr/share/zsh/site-functions) +# and rename it _brew +# +# altered from _fink _brew_all_formulae() { formulae=(`brew search`) @@ -15,6 +21,14 @@ _brew_installed_taps() { installed_taps=(`brew tap`) } +_brew_official_taps() { + official_taps=(`brew tap --list-official`) +} + +_brew_pinned_taps() { + pinned_taps=(`brew tap --list-pinned`) +} + _brew_outdated_formulae() { outdated_formulae=(`brew outdated`) } @@ -25,8 +39,10 @@ _1st_arguments=( 'cat:display formula file for a formula' 'cleanup:uninstall unused and old versions of packages' 'commands:show a list of commands' + 'config:show homebrew and system configuration' 'create:create a new formula' - 'deps:list dependencies of a formula' + 'deps:list dependencies and dependants of a formula' + 'desc:display a description of a formula' 'doctor:audits your installation for common issues' 'edit:edit a formula' 'fetch:download formula resources to the cache' @@ -37,40 +53,45 @@ _1st_arguments=( 'reinstall:install a formula anew; re-using its current options' 'leaves:show installed formulae that are not dependencies of another installed formula' 'link:link a formula' + 'linkapps:symlink .app bundles provided by formulae into /Applications' 'list:list files in a formula or not-installed formulae' 'log:git commit log for a formula' 'missing:check all installed formuale for missing dependencies.' + 'migrate:migrate renamed formula to new name' 'outdated:list formulae for which a newer version is available' 'pin:pin specified formulae' 'postinstall:perform post_install for a given formula' 'prune:remove dead links' 'remove:remove a formula' 'search:search for a formula (/regex/ or string)' - 'switch:switch linkage between installed versions of a formula' + 'switch:switch between different versions of a formula' 'tap:tap a new formula repository from GitHub, or list existing taps' + 'tap-info:information about a tap' + 'tap-pin:pin a tap' + 'tap-unpin:unpin a tap' 'test-bot:test a formula and build a bottle' 'uninstall:uninstall a formula' 'unlink:unlink a formula' + 'unlinkapps:remove symlinked .app bundles provided by formulae from /Applications' 'unpin:unpin specified formulae' 'untap:remove a tapped repository' - 'update:pull latest repository' + 'update:fetch latest version of Homebrew and all formulae' 'upgrade:upgrade outdated formulae' 'uses:show formulae which depend on a formula' + `brew commands --quiet --include-aliases` ) local expl -local -a formulae installed_formulae installed_taps outdated_formulae +local -a formulae installed_formulae installed_taps official_taps outdated_formulae _arguments \ '(-v)-v[verbose]' \ '(--cellar)--cellar[brew cellar]' \ - '(--config)--config[brew configuration]' \ '(--env)--env[brew environment]' \ '(--repository)--repository[brew repository]' \ '(--version)--version[version information]' \ '(--prefix)--prefix[where brew lives on this system]' \ '(--cache)--cache[brew cache]' \ - '(--force)--force[brew force]' \ '*:: :->subcmds' && return 0 if (( CURRENT == 1 )); then @@ -79,9 +100,18 @@ if (( CURRENT == 1 )); then fi case "$words[1]" in - install|reinstall|audit|home|homepage|log|info|abv|uses|cat|deps|edit|options) + install|reinstall|audit|home|homepage|log|info|abv|uses|cat|deps|desc|edit|options|switch) _brew_all_formulae _wanted formulae expl 'all formulae' compadd -a formulae ;; + linkapps|unlinkapps) + _arguments \ + '(--local)--local[operate on ~/Applications instead of /Applications]' \ + '1: :->forms' && return 0 + + if [[ "$state" == forms ]]; then + _brew_installed_formulae + _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae + fi ;; list|ls) _arguments \ '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \ @@ -100,9 +130,15 @@ case "$words[1]" in _arguments \ '(--macports)--macports[search the macports repository]' \ '(--fink)--fink[search the fink repository]' ;; - untap) + untap|tap-info|tap-pin) _brew_installed_taps - _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;; + _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;; + tap) + _brew_official_taps + _wanted official_taps expl 'official taps' compadd -a official_taps ;; + tap-unpin) + _brew_pinned_taps + _wanted pinned_taps expl 'pinned taps' compadd -a pinned_taps ;; upgrade) _brew_outdated_formulae _wanted outdated_formulae expl 'outdated formulae' compadd -a outdated_formulae ;; From 2a0be1aad4606031c00ba98ea24ca4a1d1109b7f Mon Sep 17 00:00:00 2001 From: Glenn / devalias Date: Wed, 10 Feb 2016 10:17:18 +1100 Subject: [PATCH 03/11] Add hash imported from --- plugins/brew/_brew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/brew/_brew b/plugins/brew/_brew index 5a5bd6b21..1f24bd67b 100644 --- a/plugins/brew/_brew +++ b/plugins/brew/_brew @@ -1,7 +1,7 @@ #compdef brew #autoload -# imported from https://github.com/Homebrew/homebrew/blob/master/Library/Contributions/brew_zsh_completion.zsh +# imported from https://github.com/Homebrew/homebrew/blob/29f73d2212c2b202fe25f69dcbf440d8391fa4c9/Library/Contributions/brew_zsh_completion.zsh # Brew ZSH completion function # Drop this somewhere in your $fpath (like /usr/share/zsh/site-functions) From 52737b18280b94a044bac44a04e5c0739459dbd7 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 10 Feb 2016 18:31:49 +0000 Subject: [PATCH 04/11] git.plugin: remove the conflicting gvt alias See FiloSottile/gvt#19 and FiloSottile/gvt#4 --- plugins/git/git.plugin.zsh | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index b851fb97d..4291da7ba 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -213,7 +213,5 @@ alias gup='git pull --rebase' alias gupv='git pull --rebase -v' alias glum='git pull upstream master' -alias gvt='git verify-tag' - 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 -m "--wip--"' From ee86f1a627d805c5fd035172f29e866508d2f0bf Mon Sep 17 00:00:00 2001 From: George Machitidze Date: Sun, 19 Jan 2014 20:54:11 -0800 Subject: [PATCH 05/11] Create dnf plugin Adds some useful aliases --- plugins/dnf/dnf.plugin.zsh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 plugins/dnf/dnf.plugin.zsh diff --git a/plugins/dnf/dnf.plugin.zsh b/plugins/dnf/dnf.plugin.zsh new file mode 100644 index 000000000..9a6abef44 --- /dev/null +++ b/plugins/dnf/dnf.plugin.zsh @@ -0,0 +1,15 @@ +## Aliases + +alias dnfl="dnf list" # List packages +alias dnfli="dnf list installed" # List installed packages +alias dnfgl="dnf grouplist" # List package groups +alias dnfmc="dnf makecache" # Generate metadata cache +alias dnfp="dnf info" # Show package information +alias dnfs="dnf search" # Search package + +alias dnfu="sudo dnf update" # Upgrade package +alias dnfi="sudo dnf install" # Install package +alias dnfgi="sudo dnf groupinstall" # Install package group +alias dnfr="sudo dnf erase" # Remove package +alias dnfgr="sudo dnf groupremove" # Remove package group +alias dnfc="sudo dnf clean all" # Clean cache From c0b12523feb43a81dbf970054eb69b5c60626936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 11 Feb 2016 21:38:10 +0100 Subject: [PATCH 06/11] Fix deprecated dnf commands Update -> upgrade Erase -> remove --- plugins/dnf/dnf.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dnf/dnf.plugin.zsh b/plugins/dnf/dnf.plugin.zsh index 9a6abef44..653ce7dda 100644 --- a/plugins/dnf/dnf.plugin.zsh +++ b/plugins/dnf/dnf.plugin.zsh @@ -7,9 +7,9 @@ alias dnfmc="dnf makecache" # Generate metadata cache alias dnfp="dnf info" # Show package information alias dnfs="dnf search" # Search package -alias dnfu="sudo dnf update" # Upgrade package +alias dnfu="sudo dnf upgrade" # Upgrade package alias dnfi="sudo dnf install" # Install package alias dnfgi="sudo dnf groupinstall" # Install package group -alias dnfr="sudo dnf erase" # Remove package +alias dnfr="sudo dnf remove" # Remove package alias dnfgr="sudo dnf groupremove" # Remove package group alias dnfc="sudo dnf clean all" # Clean cache From 624518054b9aa52bf81f9813f33d08985efe4a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 11 Feb 2016 21:38:40 +0100 Subject: [PATCH 07/11] Add README to dnf plugin --- plugins/dnf/README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 plugins/dnf/README.md diff --git a/plugins/dnf/README.md b/plugins/dnf/README.md new file mode 100755 index 000000000..f9ef496fa --- /dev/null +++ b/plugins/dnf/README.md @@ -0,0 +1,25 @@ +## Description + +This plugin makes `dnf` usage easier by adding aliases for the most +common commands. + +`dnf` is the new package manager for RPM-based distributions, which +replaces `yum`. + +## Aliases + +| Alias | Command | Description | +|-------|-------------------------|--------------------------| +| dnfl | `dnf list` | List packages | +| dnfli | `dnf list installed` | List installed packages | +| dnfgl | `dnf grouplist` | List package groups | +| dnfmc | `dnf makecache` | Generate metadata cache | +| dnfp | `dnf info` | Show package information | +| dnfs | `dnf search` | Search package | +| **Use `sudo`** | +| dnfu | `sudo dnf upgrade` | Upgrade package | +| dnfi | `sudo dnf install` | Install package | +| dnfgi | `sudo dnf groupinstall` | Install package group | +| dnfr | `sudo dnf remove` | Remove package | +| dnfgr | `sudo dnf groupremove` | Remove package group | +| dnfc | `sudo dnf clean all` | Clean cache | From 20b8b6cc741b5c1e0284117eb131ec63b7299704 Mon Sep 17 00:00:00 2001 From: Nick Russo Date: Fri, 12 Feb 2016 01:20:47 -0800 Subject: [PATCH 08/11] Sets spacing to 1 when git is absent for consistency --- themes/robbyrussell.zsh-theme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme index 24e1e8c52..60be409cf 100644 --- a/themes/robbyrussell.zsh-theme +++ b/themes/robbyrussell.zsh-theme @@ -1,7 +1,7 @@ local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" -PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}%{$reset_color%}' ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) " From 3d522ff3a6df86a0a3b3262d933e1c6c3dac9048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Fri, 12 Feb 2016 23:39:47 +0100 Subject: [PATCH 09/11] Remove non-working symbols and tidy up logic --- themes/robbyrussell.zsh-theme | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme index 60be409cf..f9eca6a87 100644 --- a/themes/robbyrussell.zsh-theme +++ b/themes/robbyrussell.zsh-theme @@ -1,7 +1,7 @@ -local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" -PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}%{$reset_color%}' +local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )" +PROMPT='${ret_status} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)' -ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) " +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" From 31614f8c40787fda8d717f51bc7d97239782e82d Mon Sep 17 00:00:00 2001 From: Marvin Frommhold Date: Thu, 18 Feb 2016 15:47:42 +0100 Subject: [PATCH 10/11] fix terminal color pollution, see issue https://github.com/robbyrussell/oh-my-zsh/issues/4856 --- plugins/mvn/mvn.plugin.zsh | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh index 865b15235..8324c495b 100644 --- a/plugins/mvn/mvn.plugin.zsh +++ b/plugins/mvn/mvn.plugin.zsh @@ -1,24 +1,24 @@ # mvn-color based on https://gist.github.com/1027800 -export BOLD=`tput bold` -export UNDERLINE_ON=`tput smul` -export UNDERLINE_OFF=`tput rmul` -export TEXT_BLACK=`tput setaf 0` -export TEXT_RED=`tput setaf 1` -export TEXT_GREEN=`tput setaf 2` -export TEXT_YELLOW=`tput setaf 3` -export TEXT_BLUE=`tput setaf 4` -export TEXT_MAGENTA=`tput setaf 5` -export TEXT_CYAN=`tput setaf 6` -export TEXT_WHITE=`tput setaf 7` -export BACKGROUND_BLACK=`tput setab 0` -export BACKGROUND_RED=`tput setab 1` -export BACKGROUND_GREEN=`tput setab 2` -export BACKGROUND_YELLOW=`tput setab 3` -export BACKGROUND_BLUE=`tput setab 4` -export BACKGROUND_MAGENTA=`tput setab 5` -export BACKGROUND_CYAN=`tput setab 6` -export BACKGROUND_WHITE=`tput setab 7` -export RESET_FORMATTING=`tput sgr0` +BOLD=`tput bold` +UNDERLINE_ON=`tput smul` +UNDERLINE_OFF=`tput rmul` +TEXT_BLACK=`tput setaf 0` +TEXT_RED=`tput setaf 1` +TEXT_GREEN=`tput setaf 2` +TEXT_YELLOW=`tput setaf 3` +TEXT_BLUE=`tput setaf 4` +TEXT_MAGENTA=`tput setaf 5` +TEXT_CYAN=`tput setaf 6` +TEXT_WHITE=`tput setaf 7` +BACKGROUND_BLACK=`tput setab 0` +BACKGROUND_RED=`tput setab 1` +BACKGROUND_GREEN=`tput setab 2` +BACKGROUND_YELLOW=`tput setab 3` +BACKGROUND_BLUE=`tput setab 4` +BACKGROUND_MAGENTA=`tput setab 5` +BACKGROUND_CYAN=`tput setab 6` +BACKGROUND_WHITE=`tput setab 7` +RESET_FORMATTING=`tput sgr0` # Wrapper function for Maven's mvn command. From 480ad804a62cf1af4bdb05d177c805f5473914ee Mon Sep 17 00:00:00 2001 From: Will Mendes Date: Mon, 22 Feb 2016 00:09:27 +1100 Subject: [PATCH 11/11] Fix bug in compass docs search --- plugins/frontend-search/README.md | 2 +- plugins/frontend-search/_frontend-search.sh | 4 ++-- plugins/frontend-search/frontend-search.plugin.zsh | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md index d0bc5589f..4d956e38f 100644 --- a/plugins/frontend-search/README.md +++ b/plugins/frontend-search/README.md @@ -38,7 +38,7 @@ Available search contexts are: | bootsnipp | `http://bootsnipp.com/search?q=` | | caniuse | `http://caniuse.com/#search=` | | codepen | `http://codepen.io/search?q=` | -| compass | `http://compass-style.org/search?q=` | +| compassdoc | `http://compass-style.org/search?q=` | | cssflow | `http://www.cssflow.com/search?q=` | | dartlang | `https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:` | | emberjs | `http://emberjs.com/api/#stp=1&stq=` | diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend-search.sh index b12f829a1..9aad76f76 100644 --- a/plugins/frontend-search/_frontend-search.sh +++ b/plugins/frontend-search/_frontend-search.sh @@ -19,7 +19,7 @@ function _frontend() { commands=( 'jquery: Search in jQuery website' 'mdn: Search in MDN website' - 'compass: Search in COMPASS website' + 'compassdoc: Search in COMPASS website' 'html5please: Search in HTML5 Please website' 'caniuse: Search in Can I Use website' 'aurajs: Search in AuraJs website' @@ -57,7 +57,7 @@ function _frontend() { mdn) _describe -t points "Warp points" frontend_points && ret=0 ;; - compass) + compassdoc) _describe -t points "Warp points" frontend_points && ret=0 ;; html5please) diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh index 2fd5416b3..3fd49ab8e 100644 --- a/plugins/frontend-search/frontend-search.plugin.zsh +++ b/plugins/frontend-search/frontend-search.plugin.zsh @@ -4,7 +4,7 @@ alias bem='frontend bem' alias bootsnipp='frontend bootsnipp' alias caniuse='frontend caniuse' alias codepen='frontend codepen' -alias compass='frontend compass' +alias compassdoc='frontend compassdoc' alias cssflow='frontend cssflow' alias dartlang='frontend dartlang' alias emberjs='frontend emberjs' @@ -32,7 +32,7 @@ function frontend() { bootsnipp 'http://bootsnipp.com/search?q=' caniuse 'http://caniuse.com/#search=' codepen 'http://codepen.io/search?q=' - compass 'http://compass-style.org/search?q=' + compassdoc 'http://compass-style.org/search?q=' cssflow 'http://www.cssflow.com/search?q=' dartlang 'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:' emberjs 'http://emberjs.com/api/#stp=1&stq=' @@ -57,7 +57,7 @@ function frontend() { print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website," print -P "and %Ucontext%u is one of the following:" print -P "" - print -P " angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compass, cssflow," + print -P " angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow," print -P " dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs," print -P " qunit, reactjs, smacss, stackoverflow, unheap" print -P "" @@ -73,7 +73,7 @@ function frontend() { echo "" echo "Valid contexts are:" echo "" - echo " angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compass, cssflow, " + echo " angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, " echo " dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs, " echo " qunit, reactjs, smacss, stackoverflow, unheap" echo ""