# HG changeset patch
# User Steve Huston <huston@astro.princeton.edu>
# Date 1471538766 14400
# Node ID 315bbb06066aabf3fbad15ba770bb9e637af50df
# Parent  90f60047d5b47b70014e202d2c9344de652b2bce
Let's put these here, for non-login shells as well

diff -r 90f60047d5b4 -r 315bbb06066a .bash_profile
--- a/.bash_profile	Thu Aug 18 12:35:16 2016 -0400
+++ b/.bash_profile	Thu Aug 18 12:46:06 2016 -0400
@@ -67,24 +67,6 @@
 fi
 hg status
 
-# Set some friendly options for history
-# Append to ~/.bash_history, don't overwrite it
-shopt -s histappend
-# Set the history a bit larger, both on disk and in memory
-export HISTFILESIZE=10000
-export HISTSIZE=10000
-# Ignore lines starting with a space, and duplicates of the previous command;
-# also, if a line is a dupe from earlier history, remove the previous line
-# entirely
-export HISTCONTROL='ignoreboth:erasedups'
-# Ignore some commonly used and not noteworthy commands
-export HISTIGNORE='bg:fg:history:ret:keys'
-# Put a timestamp on history lines
-export HISTTIMEFORMAT='%F %T '
-# Fold multi-line commands into a single line
-# This seems to be 'on' in many places already, but let's make sure
-shopt -s cmdhist
-
 [[ $HOST == cake && "`tty`" == "/dev/tty1" ]] && {
   # We're on the Raspberry Pi
   export SDL_NOMOUSE=1
diff -r 90f60047d5b4 -r 315bbb06066a .bashrc
--- a/.bashrc	Thu Aug 18 12:35:16 2016 -0400
+++ b/.bashrc	Thu Aug 18 12:46:06 2016 -0400
@@ -50,6 +50,24 @@
     ;;
 esac
 
+# Set some friendly options for history
+# Append to ~/.bash_history, don't overwrite it
+shopt -s histappend
+# Set the history a bit larger, both on disk and in memory
+export HISTFILESIZE=10000
+export HISTSIZE=10000
+# Ignore lines starting with a space, and duplicates of the previous command;
+# also, if a line is a dupe from earlier history, remove the previous line
+# entirely
+export HISTCONTROL='ignoreboth:erasedups'
+# Ignore some commonly used and not noteworthy commands
+export HISTIGNORE='bg:fg:history:ret:keys'
+# Put a timestamp on history lines
+export HISTTIMEFORMAT='%F %T '
+# Fold multi-line commands into a single line
+# This seems to be 'on' in many places already, but let's make sure
+shopt -s cmdhist
+
 #
 # Paths
 #