From a75033e40ff79898cde36f67917f6986570dd982 Mon Sep 17 00:00:00 2001 From: mj Date: Sun, 28 Feb 2016 03:04:30 +0100 Subject: [PATCH] Squashed 'repos/robbyrussell/oh-my-zsh/' changes from 534bf2c..bd6dbd1 bd6dbd1 Merge pull request #4866 from willmendesneto/master 480ad80 Fix bug in compass docs search 0d0042a Merge pull request #4857 from depressiveRobot/master 31614f8 fix terminal color pollution, see issue https://github.com/robbyrussell/oh-my-zsh/issues/4856 git-subtree-dir: repos/robbyrussell/oh-my-zsh git-subtree-split: bd6dbd1d9b1fc8a523aaf588492eb3ed4113b49d --- plugins/frontend-search/README.md | 2 +- plugins/frontend-search/_frontend-search.sh | 4 +-- plugins/frontend-search/frontend-search.plugin.zsh | 8 ++--- plugins/mvn/mvn.plugin.zsh | 40 +++++++++++----------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md index d0bc558..4d956e3 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 b12f829..9aad76f 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 2fd5416..3fd49ab 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 "" diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh index 865b152..8324c49 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. -- 2.0.0