Merge remote-tracking branch 'grimreaper/master'

aliases/available/bundler.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Bundler Commands
 alias be="bundle exec"

aliases/available/emacs.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 case $OSTYPE in
   linux*)

aliases/available/general.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # List directory contents
 alias sl=ls

aliases/available/git.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Aliases
 alias gcl='git clone'

aliases/available/heroku.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # heroku
 alias h='heroku'

aliases/available/hg.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 alias hs='hg status'
 alias hsum='hg summary'
@@ -11,4 +11,4 @@ function hg-help() {
   echo "  hsum  = hg summary"
   echo "  hcm   = hg commit -m"
   echo
-}
+}

aliases/available/osx.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Desktop Programs
 alias fireworks="open -a '/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app'"

aliases/available/rails.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Rails Commands
 alias r='rails'

aliases/available/textmate.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 case $OSTYPE in
   darwin*)

aliases/available/todo.txt-cli.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 alias tls="$TODO ls"
 alias ta="$TODO a"

aliases/available/vim.aliases.bash

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-alias v='mvim --remote-tab'
+alias v='mvim --remote-tab'

bash_it.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Initialize Bash It
 
 # Reload Library

completion/available/fabric-completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Bash completion support for Fabric (http://fabfile.org/)
 #

completion/available/rake.completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Bash completion support for Rake, Ruby Make.
 
 export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/}

completion/available/ssh.completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Bash completion support for ssh.
 
 export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/}

completion/available/tmux.completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # tmux completion
 # See: http://www.debian-administration.org/articles/317 for how to write more.

custom/example.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This is an example file. Don't use this for your custom scripts. Instead, create another file within the
 # custom directory.

lib/appearance.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # colored grep
 export GREP_OPTIONS='--color=auto'

lib/history.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # append to bash_history if Terminal.app quits
 shopt -s histappend
@@ -17,4 +17,4 @@ export AUTOFEATURE=true autotest
 
 function rh {
   history | awk '{a[$2]++}END{for(i in a){print a[i] " " i}}' | sort -rn | head
-}
+}

lib/preexec.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # http://www.twistedmatrix.com/users/glyph/preexec.bash.txt
 # preexec.bash -- Bash support for ZSH-like 'preexec' and 'precmd' functions.
 

plugins/available/base.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # For generic functions.
 

plugins/available/battery.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 battery_percentage(){
   if command_exists acpi;

plugins/available/dirs.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Directory stack navigation:
 #

plugins/available/git.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function git_remote {
   echo "Running: git remote add origin ${GIT_HOSTING}:$1.git"

plugins/available/hg.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 hg_dirty() {
     hg status --no-color 2> /dev/null \
     | awk '$1 == "?" { print "?" } $1 != "?" { print "!" }' \
@@ -11,4 +11,4 @@ hg_in_repo() {
 
 hg_branch() {
     hg branch 2> /dev/null
-}
+}

plugins/available/javascript.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # The install directory is hard-coded. TOOD: allow the directory to be specified on the command line.
 #

plugins/available/jekyll.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 editpost() {
   unset SITE

plugins/available/latex.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # add mactex to the path if its present
 MACTEX_PATH=/usr/local/texlive/2009/bin/universal-darwin

plugins/available/nginx.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function nginx_reload() {
   FILE="${NGINX_PATH}/logs/nginx.pid"
@@ -47,4 +47,4 @@ function nginx_restart() {
     echo "Nginx pid file not found"
     return 0
   fi
-}
+}

plugins/available/osx.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function tab() {
   osascript 2>/dev/null <<EOF

plugins/available/python.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ $(uname) = "Linux" ]
 then

plugins/available/rbenv.plugin.bash

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Load rbebv, if you are using it
 export PATH="$HOME/.rbenv/bin:$PATH"
 eval "$(rbenv init -)"
 
 # Load the auto-completion script if rbenv was loaded.
-source ~/.rbenv/completions/rbenv.bash
+source ~/.rbenv/completions/rbenv.bash

plugins/available/ruby.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 function remove_gem {
   gem list | grep $1 | awk '{ print $1; }' | xargs sudo gem uninstall
-}
+}

plugins/available/rvm.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Load RVM, if you are using it
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm

plugins/available/ssh.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function add_ssh() {
   echo -en "\n\nHost $1\n  HostName $2\n  User $3\n  ServerAliveInterval 30\n  ServerAliveCountMax 120" >> ~/.ssh/config
@@ -6,4 +6,4 @@ function add_ssh() {
 
 function sshlist() {
   awk '$1 ~ /Host$/ { print $2 }' ~/.ssh/config
-}
+}

plugins/available/subversion.plugin.bash

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 rm_svn(){
   find $1 -name .svn -print0 | xargs -0 rm -rf
 }
 
 svn_add(){
 	svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add
-}
+}

plugins/available/tmuxinator.plugin.bash

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && . $HOME/.tmuxinator/scripts/tmuxinator

plugins/available/vagrant.plugins.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 _vagrant()
 {
     cur="${COMP_WORDS[COMP_CWORD]}"

plugins/available/virtualenv.plugin.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # make sure virtualenvwrapper is enabled if available
 [[ `which virtualenvwrapper.sh` ]] && . virtualenvwrapper.sh

plugins/available/z.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # maintains a jump-list of the directories you actually use
 #

template/bash_profile.template.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Load RVM, if you are using it
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm

themes/base.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 THEME_PROMPT_HOST='\H'
 SCM_THEME_PROMPT_DIRTY=' ✗'

themes/bobby/bobby.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 SCM_THEME_PROMPT_DIRTY=" ${red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"

themes/candy/candy.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 function prompt_command() {
     PS1="${green}\u@\h ${blue}\T ${reset_color}${white}\w${reset_color}$(scm_prompt_info)\]${blue} →${bold_blue} ${reset_color} ";
 }

themes/colors.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function __ {
   echo "$@"

themes/demula/demula.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/usr/bin/env bash 
 
 # Theme inspired on:
 #  - Ronacher's dotfiles (mitsuhikos) - http://github.com/mitsuhiko/dotfiles/tree/master/bash/

themes/doubletime/doubletime.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 SCM_THEME_PROMPT_DIRTY=''
 SCM_THEME_PROMPT_CLEAN=''
 SCM_GIT_CHAR="${bold_cyan}±${normal}"

themes/doubletime_multiline/doubletime_multiline.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source "$BASH_IT/themes/doubletime/doubletime.theme.bash"
 

themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source "$BASH_IT/themes/doubletime/doubletime.theme.bash"
 

themes/envy/envy.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 SCM_THEME_PROMPT_DIRTY=" ${red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX=" |"

themes/hawaii50/hawaii50.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This theme was obviously inspired a lot by 
 #

themes/n0qorg/n0qorg.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # n0qorg theme by Florian Baumann <flo@noqqe.de>
 
 ## look-a-like

themes/pete/pete.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 prompt_setter() {
   # Save history

themes/rainbowbrite/rainbowbrite.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # based off of n0qorg
 # looks like, if you're in a git repo:

themes/simple/simple.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # prompt themeing
 

themes/tylenol/tylenol.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Based on 'bobby' theme with the addition of virtualenv_prompt
 #

themes/zitron/zitron.theme.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # zitron theme by Florian Baumann <flo@noqqe.de>
 
 ## git-theme