From c62d314f99d016620ac62dcda40051d38d4df671 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 8 Aug 2015 23:32:07 +0200 Subject: [PATCH] tabs to spaces --- bash_prompt | 140 ++++++++++++++++++++++++++-------------------------- osx | 10 ++-- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/bash_prompt b/bash_prompt index 7513b95..a54e0ec 100644 --- a/bash_prompt +++ b/bash_prompt @@ -6,107 +6,107 @@ ######################################################################## 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. -#PS1="\[\033]0;\w\007\]"; +PS1="\[\033]0;\w\007\]"; PS1="\[${bold}\]\n"; # newline PS1+="\[${userStyle}\]\u"; # username PS1+="\[${white}\] at "; @@ -119,4 +119,4 @@ PS1+="\[${white}\]→ \[${reset}\]"; # `→` (and reset color) export PS1; PS2="\[${yellow}\]→ \[${reset}\]"; -export PS2; \ No newline at end of file +export PS2; diff --git a/osx b/osx index a6eadd7..2be7ca3 100755 --- a/osx +++ b/osx @@ -61,7 +61,7 @@ chflags nohidden ~/Library ############################################################################### # Set Safari’s home page to `about:blank` for faster loading -defaults write com.apple.Safari HomePage -string "about:blank" +defaults write com.apple.Safari HomePage -string "" # Make Safari’s search banners default to Contains instead of Starts With defaults write com.apple.Safari FindOnPageMatchesWordStartsOnly -bool false @@ -115,8 +115,8 @@ hash tmutil &> /dev/null && sudo tmutil disablelocal ############################################################################### for app in "Activity Monitor" "Address Book" "Calendar" "Contacts" "cfprefsd" \ - "Dock" "Finder" "Mail" "Messages" "Safari" "SystemUIServer" \ - "Terminal"; do - killall "${app}" > /dev/null 2>&1 + "Dock" "Finder" "Mail" "Messages" "Safari" "SystemUIServer" \ + "Terminal"; do + killall "${app}" > /dev/null 2>&1 done -echo "Done. Note that some of these changes require a logout/restart to take effect." \ No newline at end of file +echo "Done. Note that some of these changes require a logout/restart to take effect."