Permalink
Browse files

Updated scripts to standardize on 4 spaces.

  • Loading branch information...
1 parent 3dd969e commit 79ee7bf9e96c67fc103ce4bb63576128ac2b5c6c @donnemartin committed Jul 10, 2015
Showing with 749 additions and 749 deletions.
  1. +3 −3 .aliases
  2. +68 −68 .bash_prompt
  3. +148 −148 .functions
  4. +100 −100 .gitconfig
  5. +37 −37 .vim/colors/solarized.vim
  6. +7 −7 .vim/syntax/json.vim
  7. +14 −14 .vimrc
  8. +9 −9 bootstrap.sh
  9. +154 −154 init/Solarized Dark xterm-256color.terminal
  10. +209 −209 init/Solarized Dark.itermcolors
View
@@ -17,9 +17,9 @@ alias j="jobs"
# Detect which `ls` flavor is in use
if ls --color > /dev/null 2>&1; then # GNU `ls`
- colorflag="--color"
+ colorflag="--color"
else # OS X `ls`
- colorflag="-G"
+ colorflag="-G"
fi
# List all files colorized in long format
@@ -120,7 +120,7 @@ alias map="xargs -n1"
# One of @janmoesen’s ProTip™s
for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
- alias "$method"="lwp-request -m '$method'"
+ alias "$method"="lwp-request -m '$method'"
done
# Make Grunt print stack traces by default
View
@@ -4,103 +4,103 @@
# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
- export TERM='gnome-256color';
+ export TERM='gnome-256color';
elif infocmp xterm-256color >/dev/null 2>&1; then
- export TERM='xterm-256color';
+ export TERM='xterm-256color';
fi;
prompt_git() {
- local s='';
- local branchName='';
+ local s='';
+ local branchName='';
- # Check if the current directory is in a Git repository.
- if [ $(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}") == '0' ]; then
+ # Check if the current directory is in a Git repository.
+ if [ $(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}") == '0' ]; then
- # check if the current directory is in .git before running git checks
- if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then
+ # check if the current directory is in .git before running git checks
+ if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then
- # Ensure the index is up to date.
- git update-index --really-refresh -q &>/dev/null;
+ # Ensure the index is up to date.
+ git update-index --really-refresh -q &>/dev/null;
- # Check for uncommitted changes in the index.
- if ! $(git diff --quiet --ignore-submodules --cached); then
- s+='+';
- fi;
+ # Check for uncommitted changes in the index.
+ if ! $(git diff --quiet --ignore-submodules --cached); then
+ s+='+';
+ fi;
- # Check for unstaged changes.
- if ! $(git diff-files --quiet --ignore-submodules --); then
- s+='!';
- fi;
+ # Check for unstaged changes.
+ if ! $(git diff-files --quiet --ignore-submodules --); then
+ s+='!';
+ fi;
- # Check for untracked files.
- if [ -n "$(git ls-files --others --exclude-standard)" ]; then
- s+='?';
- fi;
+ # Check for untracked files.
+ if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+ s+='?';
+ fi;
- # Check for stashed files.
- if $(git rev-parse --verify refs/stash &>/dev/null); then
- s+='$';
- fi;
+ # Check for stashed files.
+ if $(git rev-parse --verify refs/stash &>/dev/null); then
+ s+='$';
+ fi;
- fi;
+ fi;
- # Get the short symbolic ref.
- # If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
- # Otherwise, just give up.
- branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
- git rev-parse --short HEAD 2> /dev/null || \
- echo '(unknown)')";
+ # Get the short symbolic ref.
+ # If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
+ # Otherwise, just give up.
+ branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
+ git rev-parse --short HEAD 2> /dev/null || \
+ echo '(unknown)')";
- [ -n "${s}" ] && s=" [${s}]";
+ [ -n "${s}" ] && s=" [${s}]";
- echo -e "${1}${branchName}${blue}${s}";
- else
- return;
- fi;
+ echo -e "${1}${branchName}${blue}${s}";
+ else
+ return;
+ fi;
}
if tput setaf 1 &> /dev/null; then
- tput sgr0; # reset colors
- bold=$(tput bold);
- reset=$(tput sgr0);
- # Solarized colors, taken from http://git.io/solarized-colors.
- black=$(tput setaf 0);
- blue=$(tput setaf 33);
- cyan=$(tput setaf 37);
- green=$(tput setaf 64);
- orange=$(tput setaf 166);
- purple=$(tput setaf 125);
- red=$(tput setaf 124);
- violet=$(tput setaf 61);
- white=$(tput setaf 15);
- yellow=$(tput setaf 136);
+ tput sgr0; # reset colors
+ bold=$(tput bold);
+ reset=$(tput sgr0);
+ # Solarized colors, taken from http://git.io/solarized-colors.
+ black=$(tput setaf 0);
+ blue=$(tput setaf 33);
+ cyan=$(tput setaf 37);
+ green=$(tput setaf 64);
+ orange=$(tput setaf 166);
+ purple=$(tput setaf 125);
+ red=$(tput setaf 124);
+ violet=$(tput setaf 61);
+ white=$(tput setaf 15);
+ yellow=$(tput setaf 136);
else
- bold='';
- reset="\e[0m";
- black="\e[1;30m";
- blue="\e[1;34m";
- cyan="\e[1;36m";
- green="\e[1;32m";
- orange="\e[1;33m";
- purple="\e[1;35m";
- red="\e[1;31m";
- violet="\e[1;35m";
- white="\e[1;37m";
- yellow="\e[1;33m";
+ bold='';
+ reset="\e[0m";
+ black="\e[1;30m";
+ blue="\e[1;34m";
+ cyan="\e[1;36m";
+ green="\e[1;32m";
+ orange="\e[1;33m";
+ purple="\e[1;35m";
+ red="\e[1;31m";
+ violet="\e[1;35m";
+ white="\e[1;37m";
+ yellow="\e[1;33m";
fi;
# Highlight the user name when logged in as root.
if [[ "${USER}" == "root" ]]; then
- userStyle="${red}";
+ userStyle="${red}";
else
- userStyle="${orange}";
+ userStyle="${orange}";
fi;
# Highlight the hostname when connected via SSH.
if [[ "${SSH_TTY}" ]]; then
- hostStyle="${bold}${red}";
+ hostStyle="${bold}${red}";
else
- hostStyle="${yellow}";
+ hostStyle="${yellow}";
fi;
# Set the terminal title to the current working directory.
Oops, something went wrong.

0 comments on commit 79ee7bf

Please sign in to comment.