aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@users.sourceforge.net>2003-09-10 19:04:51 +0000
committerWayne Davison <wayned@users.sourceforge.net>2003-09-10 19:04:51 +0000
commita42134ea321c00d8ebe28e3194a0f0b02ba6bf51 (patch)
treed4c814618cdae405551a6ef4790d00e3299a2455
parent4b121e617bf726a1bcd49764baa6f014d01a8b2b (diff)
downloadzsh-a42134ea321c00d8ebe28e3194a0f0b02ba6bf51.tar.gz
zsh-a42134ea321c00d8ebe28e3194a0f0b02ba6bf51.tar.xz
zsh-a42134ea321c00d8ebe28e3194a0f0b02ba6bf51.zip
Improvements from the 4.1 trunk.
-rw-r--r--StartupFiles/zshenv35
1 files changed, 23 insertions, 12 deletions
diff --git a/StartupFiles/zshenv b/StartupFiles/zshenv
index 5feedf902..23363a433 100644
--- a/StartupFiles/zshenv
+++ b/StartupFiles/zshenv
@@ -1,20 +1,31 @@
#
-# Example .zshenv file for zsh 4.0
+# Generic .zshenv file for zsh
#
-# .zshenv is sourced on all invocations of the
-# shell, unless the -f option is set. It should
-# contain commands to set the command search path,
-# plus other important environment variables.
-# .zshenv should not contain commands that product
-# output or assume the shell is attached to a tty.
+# .zshenv is sourced on ALL invocations of the shell, unless the -f option is
+# set. It should NOT normally contain commands to set the command search path,
+# or other common environment variables unless you really know what you're
+# doing. E.g. running "PATH=/custom/path gdb program" sources this file (when
+# gdb runs the program via $SHELL), so you want to be sure not to override a
+# custom environment in such cases. Note also that .zshenv should not contain
+# commands that produce output or assume the shell is attached to a tty.
#
# THIS FILE IS NOT INTENDED TO BE USED AS /etc/zshenv, NOR WITHOUT EDITING
return 0 # Remove this line after editing this file as appropriate
-export X11HOME=/usr/X11
+# This kludge can be used to override some installations that put aliases for
+# rm, mv, etc. into the system profiles. Just be sure to put "unalias alias"
+# in your own rc file(s) if you use this.
+alias alias=:
-path=($X11HOME/bin)
-path=($path /usr/ucb /usr/bin /usr/etc)
-path=($path /usr/local/bin)
-path=($path ~ .)
+# Some people insist on setting their PATH here to affect things like ssh.
+# Those that do should probably use $SHLVL to ensure that this only happens
+# the first time the shell is started (to avoid overriding a customized
+# environment). Also, the various profile/rc/login files all get sourced
+# *after* this file, so they will override this value. One solution is to
+# put your path-setting code into a file named .zpath, and source it from
+# both here (if we're not a login shell) and from the .zprofile file (which
+# is only sourced if we are a login shell).
+if [[ $SHLVL == 1 && ! -o LOGIN ]]; then
+ source ~/.zpath
+fi