Merge branch 'master' of sjaffe.freenas:dotfiles

Conflicts:
	profile-util

make_links.sh

@@ -7,7 +7,7 @@ main() {
 
   # The files make_links.sh and README.md are not part of the 'dotfiles', but assistands
   # TODO(sjaffe): Make it so a list can be embedded in this instead of enumeration
-  local files=( $( find . -type f ! \( -name 'make_links.sh' -o -name 'README.md' \) | sed 's/.\///' ) )
+  local files=( $( find . -maxdepth 1 -type f ! \( -name 'make_links.sh' -o -name 'README.md' \) | sed 's/.\///' ) )
 
   for f in ${files[@]}; do
     echo ~/.${f} "-->" ${homedir}/${f}

profile-bsd

@@ -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-linux

@@ -0,0 +1 @@
+alias list="ls -lFh --color"

profile-util

@@ -3,8 +3,7 @@ PATH="$HOME/usr/local/bin:$HOME/bin:$HOME/usr/bin:$PATH"
 export PATH
 export LC_ALL=en_US.UTF-8
 
-if [ -z "$BASEPATH" ]
-then
+if [[ -z "$BASEPATH" ]]; then
   export BASEPATH="$PATH"
 fi
 
@@ -28,17 +27,12 @@ unlink-tools() {
   export LD_LIBRARY_PATH
 }
 
-if [[ $(uname) == "Darwin" ]]
-then # OSX / FreeBSD
-  alias list="ls -lFhG"
-else
-  alias list="ls -lFh --color"
-fi
 alias listall="list -A"
 alias git-graph="git log --graph --pretty=oneline --abbrev-commit --decorate --all"
 alias disk-usage="ls -A | xargs du -shc | sort -h"
 
-alias reload="source ~/.profile-user"
+alias reload="source ~/.bashrc"
+alias crontab="VIM_CRONTAB=true crontab"
 
 refreshterm() {
   clear
@@ -65,7 +59,7 @@ alias mkcd="_mkcd_fun mkdir"
 mkdirs() {
   mkdir -p "$1"
 }
-alias mkcds="_mkcd_fun mkdirs_fun"
+alias mkcds="_mkcd_fun mkdirs"
 
 alias diffr="diff --ignore-blank-lines --minimal --side-by-side --report-identical-files --suppress-common-lines"
 alias diffl="diff --changed-group-format='%<' --unchanged-group-format=''"
@@ -120,5 +114,11 @@ clrun() {
   "$@"
 }
 
+if [[ $(uname) == "Darwin" ]]; then # OSX / FreeBSD
+  . ${HOME}/.profile-bsd
+else
+  . ${HOME}/.profile-linux
+fi
+
 source ${HOME}/.profile-p4