8bef74081e9dda6e1d6c5854c2fcedb9145031ba

Message

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

Diff

This diff is truncated to protect this page.

  1diff --git a/lib/functions.zsh b/lib/functions.zsh
  2index 561586cba657cb274f76b6a7a87743e154f006e4..e494f1f4d3153b753da1b0fc2f3b87be843931b2 100644
  3--- a/lib/functions.zsh
  4+++ b/lib/functions.zsh
  5@@ -5,7 +5,7 @@ function title {
  6     print -nR $'\033k'$1$'\033'\\\
  7 
  8     print -nR $'\033]0;'$2$'\a'
  9-  elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then
 10+  elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]]; then
 11     # Use this one instead for XTerms:
 12     print -nR $'\033]0;'$*$'\a'
 13   fi
 14diff --git a/lib/git.zsh b/lib/git.zsh
 15index 889dd98dff0f76d07c2ccd7adcbec5bf66c66cff..57a78e27fb07fd9e4bf99fe115beb656e3bed062 100644
 16--- a/lib/git.zsh
 17+++ b/lib/git.zsh
 18@@ -11,3 +11,31 @@ parse_git_dirty () {
 19     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
 20   fi
 21 }
 22+
 23+# get the status of the working tree
 24+git_prompt_status() {
 25+  INDEX=$(git status --porcelain 2> /dev/null)
 26+  STATUS=""
 27+  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
 28+    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
 29+  fi
 30+  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
 31+    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
 32+  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
 33+    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
 34+  fi
 35+  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
 36+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
 37+  fi
 38+  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
 39+    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
 40+  fi
 41+  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
 42+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
 43+  fi
 44+  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
 45+    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
 46+  fi
 47+  echo $STATUS
 48+}
 49+
 50diff --git a/themes/cloud.zsh-theme b/themes/cloud.zsh-theme
 51new file mode 100644
 52index 0000000000000000000000000000000000000000..ad5e2834b832938faa4b0a8f12cb060e849cff64
 53--- /dev/null
 54+++ b/themes/cloud.zsh-theme
 55@@ -0,0 +1,6 @@
 56+PROMPT='%{$fg_bold[cyan]%}☁ %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 57+
 58+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
 59+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 60+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}] %{$fg[yellow]%}⚡%{$reset_color%}"
 61+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}]"
 62diff --git a/themes/gozilla.zsh-theme b/themes/gozilla.zsh-theme
 63new file mode 100644
 64index 0000000000000000000000000000000000000000..c6b752e9b400f9ce2ff8942c937822e62306f164
 65--- /dev/null
 66+++ b/themes/gozilla.zsh-theme
 67@@ -0,0 +1,15 @@
 68+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 69+
 70+ZSH_THEME_GIT_PROMPT_PREFIX="("
 71+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
 72+ZSH_THEME_GIT_PROMPT_DIRTY=""
 73+ZSH_THEME_GIT_PROMPT_CLEAN=""
 74+
 75+RPROMPT='$(git_prompt_status)%{$reset_color%}'
 76+
 77+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
 78+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
 79+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
 80+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
 81+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
 82+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"
 83diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
 84new file mode 100644
 85index 0000000000000000000000000000000000000000..fa7c590355a2a1fcd8b7c4d87ad19e9f234be2eb
 86--- /dev/null
 87+++ b/themes/philips.zsh-theme
 88@@ -0,0 +1,14 @@
 89+if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
 90+
 91+PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
 92+RPROMPT='[%*]'
 93+
 94+# git theming
 95+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B"
 96+ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
 97+ZSH_THEME_GIT_PROMPT_CLEAN=""
 98+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}"
 99+
100+# LS colors, made with http://geoff.greer.fm/lscolors/
101+export LSCOLORS="Gxfxcxdxbxegedabagacad"