dot/xinitrc: Use modern command-substitution syntax.

[profile] / dot / bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 6d06f7e..990d645 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -6,9 +6,9 @@ __mdw_shell=bash
 
 ## Only do this if we haven't done it before.  (Note that this guard isn't
 ## exported, so subshells will need to make their own arrangements.)
-case ${__mdw_shellrc+t} in
+case ${__mdw_bashrc+t} in
   t) ;;
-  *) __mdw_shellrc=done
+  *) __mdw_bashrc=t
 
 ## Fetch the common configuration.
 . "$HOME/.shell-rc"
@@ -22,16 +22,12 @@ __mdw_source_if_exists /etc/bashrc
 ## Completion.
 __mdw_source_if_exists /etc/bash_completion "$HOME/.bash_completion"
 
-## Set the temporary directory again.  (If we've switched users, we'll want a
-## different temporary directory.)
-case ${TMPDIR+t} in t) ;; *) eval $(tmpdir -b); esac
-
 ###--------------------------------------------------------------------------
 ### Prompt hacking.
 
 __mdw_set_prompt_hacks () {
   case "$TERM" in
-    linux*|screen*|xterm*|vt100*|eterm*)
+    linux*|screen*|xterm*|putty*|vt100*|eterm*)
       case "$(tput bold)" in
        "") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
        *) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
@@ -39,7 +35,8 @@ __mdw_set_prompt_hacks () {
       gitcolour="\[$(tput setaf 6)\]"
       rccolour="\[$(tput setaf 1)\]"
       uncolour="\[$(tput op)\]"
-      nl="\[\r\]"
+      nl="\[
+\]"
       ;;
   esac
   host='\h' dir=' \w'
@@ -76,6 +73,7 @@ shopt -s extglob
 if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi
 shopt -s gnu_errfmt
 shopt -s histappend
+set -o histexpand
 shopt -s histreedit
 shopt -u histverify
 shopt -s hostcomplete