Merge branch 'master' of gitosis@majnematic.com:davesdots

bash_profile

@@ -1 +1 @@
-source ~/.bashrc
+. ~/.bashrc

commonsh/02_term

@@ -65,7 +65,7 @@ TERM=`fix_term $TERM`
 
 # I am sorry to hear that you are running an
 # xterm that has no colors (I am looking at you solaris)
-if [ $TERM = xterm ] && (type -p tput > /dev/null 2>&1) && [ `tput -T xterm colors` = -1 ] ; then
+if [ $TERM = xterm ] && (command -v tput > /dev/null 2>&1) && [ `tput -T xterm colors` = -1 ] ; then
 	# lets see what we can do about your terrible term
 	TERM=`fix_term xterm-color`
 fi

commonsh/10_alias

@@ -41,7 +41,7 @@ case `uname -s` in
 			alias ls="gls -h --color=auto"
 		else
 			# you have a GNU ls, surprise...
-			case `ls --version 2>/dev/null | head -1` in
+			case `ls --version 2>/dev/null | head -n 1` in
 				*fileutils*|*coreutils*)
 					alias ls="ls -h --color=auto"
 				;;
@@ -55,7 +55,7 @@ case `uname -s` in
 			alias grep='ggrep -d skip --color=auto'
 		else
 			# woah, you have a GNU grep...
-			case `grep --version 2>/dev/null | head -1` in
+			case `grep --version 2>/dev/null | head -n 1` in
 				*GNU*)
 					alias grep='grep -d skip --color=auto'
 				;;

commonsh/10_pager

@@ -7,7 +7,7 @@ export PAGER
 if [ $PAGER = less ] ; then
 	for lesspipe in lesspipe lesspipe.sh ; do
 		lesspipe_test=`command -v ${lesspipe} 2>/dev/null`
-		if [ -n $lesspipe_test ] ; then
+		if [ -n "${lesspipe_test}" ] ; then
 			LESSOPEN="| ${lesspipe_test} %s" && break
 			export LESSOPEN
 		fi

inputrc

@@ -142,6 +142,11 @@ $if mode=emacs
 		"\e[H": beginning-of-line
 		"\e[U": end-of-line
 	$endif
+	$if term=sun
+		"\e[214z": beginning-of-line
+		"\e[220z": end-of-line
+		"^?":      delete-char
+	$endif
 	$if term=cygwin
 		"\e[1~": beginning-of-line
 		"\e[4~": end-of-line

ksh/prompt

@@ -1,9 +1,12 @@
-if [ $USER = root ] ; then
+if [ -z "${USER}" ] ; then
+	USER=$LOGNAME
+fi
+
+if [ $USER ] && [ $USER = root ] ; then
 	BASE="#"
 else
 	BASE="$"
 fi
 
-
 PS1=$'\E[01;32m'"${USER} "$'\E[01;34m''$PWD'" ${BASE} "$'\E[0m'
 export PS1

vimrc

@@ -264,8 +264,11 @@ inoremap # X<BS>#
 map <C-h> <BS>
 map! <C-h> <BS>
 if (&term =~ "interix")
+   map  <C-?> <DEL>
+   map! <C-?> <DEL>
    map  <Home>
    map  <End>
+elseif (&term =~ "^sun")
    map  <C-?> <DEL>
    map! <C-?> <DEL>
 elseif (&term !~ "cons")

zsh/bindkey

@@ -61,6 +61,11 @@ case $TERM in
 		bindkey '\e[U' end-of-line
 		bindkey '^?'   delete-char
 	;;
+	sun*)
+		bindkey '\e[214z' beginning-of-line
+		bindkey '\e[220z' end-of-line
+		bindkey '^?'   delete-char
+	;;
 	cygwin*)
 		bindkey '\e[1~' beginning-of-line
 		bindkey '\e[4~' end-of-line

zsh/icc

@@ -4,19 +4,19 @@ if [ -d "/opt/intel/Compiler" ] ; then
 	if [ -r $iccvars_path ] ; then
 		case `uname -m` in
 			x86_64)
-				source $iccvars_path intel64
+				. $iccvars_path intel64
 			;;
 			i*86)
-				source $iccvars_path ia32
+				. $iccvars_path ia32
 			;;
 			ia64)
-				source $iccvars_path ia64
+				. $iccvars_path ia64
 			;;
 		esac
 	fi
 elif [ -d "/opt/intel/cc" ] || [ -d "/opt/intel/cce" ] ; then
 	iccvars_path=$(echo /opt/intel/cc*/(10|9).*/bin/iccvars.sh(On[1]))
 	if [ -r $iccvars_path ] ; then
-		source $iccvars_path
+		. $iccvars_path
 	fi
 fi

zsh/prompt

@@ -1,5 +1,5 @@
 # prompt
-if [ -z ${SSH_TTY} ] ; then
+if [ -z "${SSH_TTY}" ] ; then
 	PROMPT=$'%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
 	RPROMPT=$'%1(j.%{\e[00;36m%}[%j].)%{\e[01;33m%}[%t]%{\e[00;00m%}'
 else