dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.

[profile] / dot / bashrc

diff --git a/dot/bashrc b/dot/bashrc
index c39392a..37ff27c 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -1,4 +1,4 @@
-### -*-sh-*-
+### -*-bash-*-
 ###
 ### Bash session things
 
@@ -26,7 +26,12 @@ if [ -t 0 ]; then
   ## Fancy highlighting in some terminals.
   case "$TERM" in
     linux*|screen*|xterm*|vt100*|eterm*)
-      bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" nl="\[\r\]" ;;
+      case "$(tput bold)" in
+       "") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
+       *) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
+      esac
+      nl="\[\r\]"
+      ;;
     *)
       bold='' unbold='' nl='' ;;
   esac
@@ -35,8 +40,8 @@ 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="]" ;;
@@ -98,7 +103,10 @@ alias cx='chmod a+x'
 alias which="command -v"
 alias rc="rc -l"
 alias ssync="rsync -e ssh"
-alias rootly=$__MDW_ROOTLY
+rootly () {
+  case $# in 0) set -- "${SHELL-/bin/sh}" ;; esac
+  $__MDW_ROOTLY "$@"
+}
 alias r=rootly
 alias re="rootly $EDITOR"
 alias pstree="pstree -hl"