diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-09-29 20:43:33 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-09-29 20:43:33 +0000 |
| commit | 85fd642711877cfffc1de8f7a007a185765af942 (patch) | |
| tree | e2be2c43442598a4b764c478a9038d1543d322be | |
| parent | 9f2bf1f0f29d51368a0da52996a510a527e8b45d (diff) | |
| download | zsh-85fd642711877cfffc1de8f7a007a185765af942.tar.gz zsh-85fd642711877cfffc1de8f7a007a185765af942.zip | |
Vin Shelton: 22789: 22783 broke .zshenv
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/init.c | 18 |
2 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,7 @@ +2006-09-29 Vin Shelton <acs@xemacs.org> + + * 22789: Src/init.c: Source zshenv even if non-interactive. + 2006-09-29 Andrey Borzenkov <bor@zsh.org> * 22787: Srz/Zsh/compmatch.c: change calling convention of diff --git a/Src/init.c b/Src/init.c index 4121e9b70..7645af6b2 100644 --- a/Src/init.c +++ b/Src/init.c @@ -958,15 +958,17 @@ run_init_scripts(void) source(GLOBAL_ZSHENV); #endif - if (isset(RCS) && isset(INTERACTIVE) && unset(PRIVILEGED)) + if (isset(RCS) && unset(PRIVILEGED)) { - /* - * Always attempt to load the newuser module to perform - * checks for new zsh users. Don't care if we can't load it. - */ - if (load_module_silence("zsh/newuser", 1)) { - /* Unload it immediately. */ - unload_named_module("zsh/newuser", "zsh", 1); + if (isset(INTERACTIVE)) { + /* + * Always attempt to load the newuser module to perform + * checks for new zsh users. Don't care if we can't load it. + */ + if (load_module_silence("zsh/newuser", 1)) { + /* Unload it immediately. */ + unload_named_module("zsh/newuser", "zsh", 1); + } } sourcehome(".zshenv"); |