Merge remote-tracking branch 'origin/master'

profile-bsd

@@ -1,9 +1 @@
 alias list="ls -lFhG"
-
-readlink() {
-  if [[ "$1" == "-f" ]]; then
-    perl -MCwd -e 'print Cwd::abs_path shift' "$2"
-  else
-    "$(which readlink)" "$@"
-  fi
-}

profile-osx

@@ -0,0 +1,9 @@
+alias list="ls -lFhG"
+
+readlink() {
+  if [[ "$1" == "-f" ]]; then
+    perl -MCwd -e 'print Cwd::abs_path shift' "$2"
+  else
+    "$(which readlink)" "$@"
+  fi
+}

profile-util

@@ -146,7 +146,9 @@ clrun() {
   "$@"
 }
 
-if [[ $(uname) == "Darwin" ]]; then # OSX / FreeBSD
+if [[ $(uname) == "Darwin" ]]; then # OSX
+  . ${HOME}/.profile-osx
+elif [[ $(uname) == *BSD* ]]; then # FreeBSD
   . ${HOME}/.profile-bsd
 else
   . ${HOME}/.profile-linux