diff options
| author |   Torsten Veller <tove@gentoo.org> | 2008-05-23 12:02:51 +0000 |
|---|---|---|
| committer | Torsten Veller <tove@gentoo.org> | 2008-05-23 12:02:51 +0000 |
| commit | 20e781e862e1eaf0873ab54d7cde2dac9ebd7419 (patch) | |
| tree | b03a5fa2fb789c8ad502214472e31d1160e6d37e /app-shells/zsh | |
| parent | - Keyworded (diff) | |
| download | gentoo-2-20e781e862e1eaf0873ab54d7cde2dac9ebd7419.tar.gz gentoo-2-20e781e862e1eaf0873ab54d7cde2dac9ebd7419.tar.bz2 gentoo-2-20e781e862e1eaf0873ab54d7cde2dac9ebd7419.zip | |
Don't extract EDITOR, PAGER from rc.conf (#222793)
(Portage version: 2.1.5.2)
Diffstat (limited to 'app-shells/zsh')
| -rw-r--r-- | app-shells/zsh/ChangeLog | 5 | ||||
| -rw-r--r-- | app-shells/zsh/files/zprofile | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog index 24892e38e8bb..37112b1d0e53 100644 --- a/app-shells/zsh/ChangeLog +++ b/app-shells/zsh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-shells/zsh # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.132 2008/04/04 08:31:19 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.133 2008/05/23 12:02:50 tove Exp $ + + 23 May 2008; Torsten Veller <tove@gentoo.org> files/zprofile: + Don't extract EDITOR, PAGER from rc.conf (#222793) *zsh-4.3.6 (04 Apr 2008) diff --git a/app-shells/zsh/files/zprofile b/app-shells/zsh/files/zprofile index bec0e52fd3b4..73a7cf83d0f4 100644 --- a/app-shells/zsh/files/zprofile +++ b/app-shells/zsh/files/zprofile @@ -1,5 +1,5 @@ # /etc/zsh/zprofile -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.4 2007/05/07 06:51:11 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.5 2008/05/23 12:02:51 tove Exp $ # Load environment settings from profile.env, which is created by # env-update from the files in /etc/env.d @@ -7,7 +7,12 @@ if [ -e /etc/profile.env ] ; then . /etc/profile.env fi -#077 would be more secure, but 022 is generally quite realistic +# You should override these in your ~/.zprofile (or equivalent) for per-user +# settings. For system defaults, you can add a new file in /etc/profile.d/. +export EDITOR=${EDITOR:-/bin/nano} +export PAGER=${PAGER:-/usr/bin/less} + +# 077 would be more secure, but 022 is generally quite realistic umask 022 # Set up PATH depending on whether we're root or a normal user. @@ -26,17 +31,10 @@ fi export PATH unset ROOTPATH -# Extract the value of EDITOR -[ -z "$EDITOR" ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`" -[ -z "$EDITOR" ] && EDITOR="/bin/nano" -export EDITOR - shopts=$- setopt nullglob for sh in /etc/profile.d/*.sh ; do - if [ -r "$sh" ] ; then - . "$sh" - fi + [ -r "$sh" ] && . "$sh" done unsetopt nullglob set -$shopts |