From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 12 Jul 2014 11:03:18 +0000 (+0200)
Subject: set HISTCONTROL in root's bashrc.  Only set stuff when running interactively
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4af3700cae6d66e2cc5135b9910bdc8c0411d75d;p=mirror%2Fdsa-puppet.git

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 ab93fcbaf..74bf5a309 100644
--- 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: