From a3d8018d5f6547c85a366db053d2ef22ac40e433 Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Wed, 30 Nov 2011 22:31:01 +0100 Subject: [PATCH] zshrc: Remove the root/non-root split Signed-off-by: Frank Terbeck --- doc/grmlzshrc.t2t | 3 --- etc/zsh/zshrc | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/doc/grmlzshrc.t2t b/doc/grmlzshrc.t2t index f694ad6..3aae18f 100644 --- a/doc/grmlzshrc.t2t +++ b/doc/grmlzshrc.t2t @@ -56,9 +56,6 @@ put the battery status into the right hand side interactive prompt. A non zero value activates a handler, which is called when a command can not be found. The handler is defined by GRML_ZSH_CNF_HANDLER (see below). -: **GRML_ALWAYS_LOAD_ALL** -Enables the whole Grml setup for root, if set to a non zero value. - : **GRML_ZSH_CNF_HANDLER** This variable contains the handler to be used by COMMAND_NOT_FOUND (see above) and defaults to "/usr/share/command-not-found/command-not-found". diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 300f624..dad3104 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -287,7 +287,6 @@ COMMAND_NOT_FOUND=${COMMAND_NOT_FOUND:-0} GRML_ZSH_CNF_HANDLER=${GRML_ZSH_CNF_HANDLER:-/usr/share/command-not-found/command-not-found} BATTERY=${BATTERY:-0} GRMLSMALL_SPECIFIC=${GRMLSMALL_SPECIFIC:-1} -GRML_ALWAYS_LOAD_ALL=${GRML_ALWAYS_LOAD_ALL:-0} ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0} # utility functions @@ -1484,10 +1483,6 @@ very lately. System wide configuration without touching configuration files of grml can take place in /etc/zsh/zshrc.local. -Normally, the root user (EUID == 0) does not get the whole grml setup. -If you want to force the whole setup for that user, too, set -GRML_ALWAYS_LOAD_ALL=1 in .zshrc.pre in root'\''s home directory. - For information regarding zsh start at http://grml.org/zsh/ Take a look at grml'\''s zsh refcard: @@ -2182,14 +2177,6 @@ fi # load the lookup subsystem if it's available on the system zrcautoload lookupinit && lookupinit -### non-root (EUID != 0) code below -### - -if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then - zrclocal - return 0 -fi - # variables # set terminal property (used e.g. by msgid-chooser) -- 2.1.4