diff options
| author | Tim Harder <radhermit@gentoo.org> | 2017-08-09 14:52:50 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2017-08-09 14:58:52 -0400 |
| commit | 86a207399d8e4abaf3a1a3999fbbce2cb068aa30 (patch) | |
| tree | df9eba704db160ffaaf164a67035bd750964f648 /app-shells/zsh/files | |
| parent | 2abe351d0a4cd318ac47cc3a150b5e930f0f1559 (diff) | |
| download | gentoo-86a207399d8e4abaf3a1a3999fbbce2cb068aa30.tar.gz gentoo-86a207399d8e4abaf3a1a3999fbbce2cb068aa30.tar.xz | |
app-shells/zsh: version bump to 5.4.1
Also, apply patch by Mike Gilbert to set PATH=${ROOTPATH} if EUID = 0;
otherwise, leave it alone. Leave prefix as-is for now.
Bug: https://bugs.gentoo.org/255695
Bug: https://bugs.gentoo.org/621334
Diffstat (limited to 'app-shells/zsh/files')
| -rw-r--r-- | app-shells/zsh/files/zprofile-2 | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/app-shells/zsh/files/zprofile-2 b/app-shells/zsh/files/zprofile-2 new file mode 100644 index 00000000000..9c4313c4494 --- /dev/null +++ b/app-shells/zsh/files/zprofile-2 @@ -0,0 +1,41 @@ +# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zprofile + +# Load environment settings from profile.env, which is created by +# env-update from the files in /etc/env.d +if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then + . "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env +fi + +# 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. +# There's no real reason to exclude sbin paths from the normal user, +# but it can make tab-completion easier when they aren't in the +# user's PATH to pollute the executable namespace. +# +# It is intentional in the following line to use || instead of -o. +# This way the evaluation can be short-circuited and calling whoami is +# avoided. +if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then + @ZSH_NOPREFIX@PATH="${ROOTPATH}" + @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin" +@ZSH_PREFIX@else + @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin" +fi +export PATH +unset ROOTPATH + +shopts=$- +setopt nullglob +for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do + [ -r "$sh" ] && . "$sh" +done +unsetopt nullglob +set -$shopts +unset sh shopts |