Merge branch 'master' of git://github.com/revans/bash-it

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
-custom/*.bash
+custom/*.bash
-!custom/example.bash

README.md

@@ -7,7 +7,7 @@ From what I remember, I've incorporated things I have found from the following:
 * oh-my-zsh   (http://github.com/robbyrussell/oh-my-zsh)
 * Steve Losh  (http://stevelosh.com/)
 
-Includes some autocompletion tools, theming support, aliases, custom functions, and more.
+Includes some autocompletion tools, theming support, aliases, custom functions, and more. 
 
 ## Install
 
@@ -30,6 +30,9 @@ rails-help
 git-help
 </code></pre>
 
+## Your Custom scripts, aliases, and functions
+
+If you have custom stuff that you don't want committed to bash it, put those scripts into the custom directory. It is automatically ignored by git.
 
 ## Themes
 

bash_it.sh

@@ -51,6 +51,13 @@ done
 
 export PS1=$PROMPT
 
+
+# Adding Support for other OSes
+PREVIEW="less"
+[ -s /usr/bin/gloobus-preview ] && PREVIEW="gloobus-preview"
+[ -s /Applications/Preview.app ] && PREVIEW="/Applications/Preview.app"
+
+
 #
 # Custom Help
 

completion/brew.completion.bash

@@ -1,3 +1,5 @@
-if [ -f `brew --prefix`/Library/Contributions/brew_bash_completion.sh ]; then
+if [ `which brew` ]; then
-  . `brew --prefix`/Library/Contributions/brew_bash_completion.sh
+  if [ -f `brew --prefix`/Library/Contributions/brew_bash_completion.sh ]; then
-fi
+    . `brew --prefix`/Library/Contributions/brew_bash_completion.sh
+  fi
+fi

custom/custom.bash

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Your Custom Bash alias', functions, etc.
-#

functions/base.funtions.bash

@@ -6,22 +6,22 @@ function ips {
 
 function myip {
   res=$(curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+')
-  echo "Your public IP is: ${bold_green} $res ${normal}" 
+  echo "Your public IP is: ${bold_green} $res ${normal}"
 }
 
 
 # View man documentation in Preview
 pman () {
-   man -t "${1}" | open -f -a /Applications/Preview.app/
+   man -t "${1}" | open -f -a $PREVIEW
 }
 
 
 pcurl() {
-  curl "${1}" | open -f -a /Applications/Preview.app/
+  curl "${1}" | open -f -a $PREVIEW
 }
 
 pri() {
-  ri -T "${1}" | open -f -a /Applications/Preview.app/
+  ri -T "${1}" | open -f -a $PREVIEW
 }
 
 

functions/git.functions.bash

@@ -18,3 +18,7 @@ function git_remove_missing_files() {
 function local-ignore() {
   echo "$1" >> .git/info/exclude
 }
+
+function gitignore() {
+  echo ".DS_Store" >> .gitignore
+}

functions/javascript.functions.bash

@@ -1,4 +1,8 @@
 #!/bin/bash
+#
+# The install directory is hard-coded. TOOD: allow the directory to be specified on the command line.
+#
+
 
 function rails_jquery {
   curl -o public/javascripts/rails.js http://github.com/rails/jquery-ujs/raw/master/src/rails.js

plugins/base.plugin.bash

@@ -3,9 +3,14 @@
 # Desktop Programs
 alias fireworks="open -a '/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app'"
 alias photoshop="open -a '/Applications/Adobe Photoshop CS3/Adobe Photoshop.app'"
-alias preview="open -a '/Applications/Preview.app'"
+alias preview="open -a '$PREVIEW'"
 alias xcode="open -a '/Developer/Applications/Xcode.app'"
 alias filemerge="open -a '/Developer/Applications/Utilities/FileMerge.app'"
 alias safari="open -a safari"
 alias firefox="open -a firefox"
-alias dashcode="open -a dashcode"
+alias dashcode="open -a dashcode"
+
+
+if [ -s /usr/bin/firefox ] ; then
+  unalias firefox
+fi

plugins/git.plugin.bash

@@ -7,7 +7,6 @@ alias gs='git status'
 alias gl='git pull'
 alias gup='git fetch && git rebase'
 alias gp='git push'
-alias gd='git diff | mate'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
@@ -18,6 +17,20 @@ alias gcp='git cherry-pick'
 alias gco='git checkout'
 alias gexport='git archive --format zip --output'
 
+case $OSTYPE in
+  linux*)
+    alias gd='git diff | vim -R -'
+    ;;
+  darwin*)
+    alias gd='git diff | mate'
+    ;;
+  darwin*)
+    alias gd='git diff'
+    ;;
+esac
+
+
+
 function git-help() {
   echo "Git Custom Aliases Usage"
   echo 

themes/bobby/bobby.theme.bash

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # prompt themeing
-PROMPT='\n${bold_blue}$(prompt_char)$(git_prompt_info) ${orange}\h ${reset_color}in ${green}\w ${reset_color}→ '
+PROMPT='${bold_blue}$(prompt_char)$(git_prompt_info) ${orange}\h ${reset_color}in ${green}\w ${reset_color}→ '
 
 # git themeing
 GIT_THEME_PROMPT_DIRTY=" ${red}✗"

themes/standard/standard.theme.bash

@@ -0,0 +1,9 @@
+PROMPT='\[${green}\]\u\[${normal}\]@\[${green}\]\h\[${normal}\]:\[${blue}\]\w\[${normal}\]\[${red}\]$(prompt_char)$(git_prompt_info)\[${normal}\]\$ '
+
+# git themeing
+GIT_THEME_PROMPT_DIRTY="×"
+GIT_THEME_PROMPT_CLEAN="✓"
+GIT_THEME_PROMPT_PREFIX=""
+GIT_THEME_PROMPT_SUFFIX=""
+
+# ${debian_chroot:+($debian_chroot)}