From 85fd642711877cfffc1de8f7a007a185765af942 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 29 Sep 2006 20:43:33 +0000 Subject: Vin Shelton: 22789: 22783 broke .zshenv --- Src/init.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Src/init.c') 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"); -- cgit 1.4.1