X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ac03a1f6de3456e4f41330a3bf4644fa76bc1193..0840478579e766d3b580bff2ca0d0b099306607e:/dot/bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 69af4a1..1b6d7af 100644
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -1,4 +1,4 @@
-### -*-sh-*-
+### -*-bash-*-
 ###
 ### Bash session things
 
@@ -24,9 +24,15 @@ __mdw_bashrc=done
 if [ -t 0 ]; then
 
   ## Fancy highlighting in some terminals.
+  marker=${STY+'\[k\\\]'}
   case "$TERM" in
     linux*|screen*|xterm*|vt100*|eterm*)
-      bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" nl="\[
\]" ;;
+      case "$(tput bold)" in
+	"") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
+	*) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
+      esac
+      nl="\[
\]"
+      ;;
     *)
       bold='' unbold='' nl='' ;;
   esac
@@ -35,11 +41,11 @@ if [ -t 0 ]; then
   ## highlight when I'm running as some other user.  Highlight when this
   ## isn't the outermost shell on the terminal.
   if (( EUID == 0 )); then
-    left=`echo « | iconv -f utf8 -t //translit`
-    right=`echo » | iconv -f utf8 -t //translit`
+    left=`echo « | iconv -f UTF-8 -t //translit`
+    right=`echo » | iconv -f UTF-8 -t //translit`
   else
     case $USER in
-      mdw|mwooding) u="" left="[" right="]" ;;
+      mdw|mwooding|nemo) u="" left="[" right="]" ;;
       *) u="\\u@" left="{" right="}" ;;
     esac
     if [ "$__mdw_tty" = "`tty`" ]; then
@@ -57,7 +63,7 @@ if [ -t 0 ]; then
   fi
 
   ## Build the prompt string.
-  PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$right$unbold"
+  PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$marker$right$unbold"
   PS2="$PS1 $bold>$unbold "
 
 fi
@@ -76,7 +82,7 @@ shopt -s cmdhist
 shopt -u dotglob
 shopt -s expand_aliases
 shopt -s extglob
-shopt -s globstar
+if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi
 shopt -s gnu_errfmt
 shopt -s histappend
 shopt -s histreedit
@@ -125,7 +131,7 @@ else
   unset LS_COLORS
 fi
 
-ls () {
+unalias ls 2>/dev/null || :; function ls () {
   if [ -t 1 ]; then
     command ls $LS_OPTIONS ${LS_COLORS+--color=auto} "$@"
   else