diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-05-06 20:18:00 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2012-05-06 20:18:00 +0200 |
| commit | d3e5f9b1c6cc3d46aa37c793cd111ea26d2dc2e0 (patch) | |
| tree | 401da449b3f2c836c7abec602004461b0b01abdb | |
| parent | cc67e0b3b6b04ca0356834eb68a45b5fda1c220d (diff) | |
| download | dotfiles-d3e5f9b1c6cc3d46aa37c793cd111ea26d2dc2e0.tar.gz dotfiles-d3e5f9b1c6cc3d46aa37c793cd111ea26d2dc2e0.tar.xz dotfiles-d3e5f9b1c6cc3d46aa37c793cd111ea26d2dc2e0.zip | |
Revert "bashrc/main: do not update on non interactive shell but set environment"
This reverts commit 520dcb9f6dba95066296de9f71e398cc30b84f69.
Conflicts:
bashrc/main.sh
| -rw-r--r-- | bashrc/main.sh | 5 |
1 files changed, 4 insertions, 1 deletions
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 '*' |