set HISTCONTROL in root's bashrc. Only set stuff when running interactively

diff --git a/modules/debian-org/files/root-dotfiles/bashrc b/modules/debian-org/files/root-dotfiles/bashrc
index ab93fcbafc0a0cb2461cae064f9d3f25c85bfad3..74bf5a30920516c6350a30db4c4c0be8c1913af1 100644 (file)
--- a/modules/debian-org/files/root-dotfiles/bashrc
+++ b/modules/debian-org/files/root-dotfiles/bashrc
@@ -3,10 +3,14 @@
 ## THIS FILE IS UNDER PUPPET CONTROL.
 ## LOCAL CHANGES WILL BE OVERWRITTEN.
 
-export LS_OPTIONS='--color=auto'
-eval "`dircolors`"
-alias ls='ls $LS_OPTIONS'
-alias ll='ls $LS_OPTIONS -l'
-alias l='ls $LS_OPTIONS -lA'
+if [ "$PS1" ]; then
+  typeset HISTCONTROL=ignoreboth
+
+  export LS_OPTIONS='--color=auto'
+  eval "`dircolors`"
+  alias ls='ls $LS_OPTIONS'
+  alias ll='ls $LS_OPTIONS -l'
+  alias l='ls $LS_OPTIONS -lA'
+fi
 
 # vim: set ft=sh ts=2 sw=2 et ai si: