dotfiles

commit 2735a9546c3ea3dfaf5e138c9b05bbf8ef3e3992
parent 4d504ad0d7ddb2f80624440eb584914592947f90
Author: Chris Bracken <chris@bracken.jp>
Date:   Tue,  4 Nov 2014 10:30:13 -0800

Minor formatting, cleanup.

Diffstat:
M
.aliases
 | 
9
++++++---
M
.profile
 | 
9
+++++----

2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.aliases b/.aliases
@@ -2,13 +2,16 @@
 # ~/.aliases
 
 # add color
-if [[ -x /usr/bin/dircolors || -x /usr/homebrew/opt/coreutils/libexec/gnubin/dircolors ]]; then
-  test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+if [[ -x '/usr/bin/dircolors' || \
+      -x '/usr/homebrew/opt/coreutils/libexec/gnubin/dircolors' ]]; then
+  if [[ -r "~/.dircolors" ]]; then
+    eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+  fi
   alias ls='ls -F --color=auto'
   alias grep='grep --color=auto'
   alias fgrep='fgrep --color=auto'
   alias egrep='egrep --color=auto'
-elif [[ `uname` == 'Darwin' ]]; then
+elif [[ "$(uname)" == 'Darwin' ]]; then
   alias ls='ls -FG'
 fi
 
diff --git a/.profile b/.profile
@@ -11,7 +11,7 @@ umask 022
 export EDITOR=/usr/bin/vim
 export GNUPGHOME="$HOME/.gnupg"
 export DART_SDK="$HOME/src/third_party/dart-sdk"
-export GOROOT=`go env GOROOT`
+export GOROOT="$(go env GOROOT)"
 export GOPATH="$HOME/src/go"
 export TERMINAL=urxvt
 
@@ -23,14 +23,15 @@ if [ -n "$BASH_VERSION" ]; then
 fi
 
 # Remap caps lock to ctrl
-if [ $(uname) != "Darwin" ] && [ -n "$DISPLAY" ] && [ -x "`which setxkbmap`" ]; then
+if [[ "$(uname)" != "Darwin" && -n "$DISPLAY" && -x "$(which setxkbmap)" ]]
+then
   setxkbmap -option ctrl:nocaps
 fi
 
 # login message
-if [ -x /usr/games/fortune ]; then
+if [ -x "/usr/games/fortune" ]; then
   /usr/games/fortune
-elif [ -x /opt/local/bin/fortune ]; then
+elif [ -x "/opt/local/bin/fortune" ]; then
   /opt/local/bin/fortune
 fi
 echo