From d3e5f9b1c6cc3d46aa37c793cd111ea26d2dc2e0 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 6 May 2012 20:18:00 +0200 Subject: Revert "bashrc/main: do not update on non interactive shell but set environment" This reverts commit 520dcb9f6dba95066296de9f71e398cc30b84f69. Conflicts: bashrc/main.sh --- bashrc/main.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bashrc/main.sh b/bashrc/main.sh index cd5c5c4..253c943 100644 --- a/bashrc/main.sh +++ b/bashrc/main.sh @@ -1,5 +1,8 @@ # this file is sourced by all bash shells on startup +# test for interactive shell +[[ $- != *i* ]] && return + # return if this script is executed twice [[ -n $(declare -p _DOTFILES_DIR 2>/dev/null) ]] && return @@ -121,7 +124,7 @@ _load() { } # update first -[[ $- == *i* ]] && _self_update +_self_update _load common '*' -- cgit v1.2.3