From: Nick Bowler Date: Thu, 21 Jan 2010 19:01:26 +0000 (-0500) Subject: zprofile: Cleanup. X-Git-Url: https://git.draconx.ca/gitweb/zshconf.git/commitdiff_plain/96319d2f69e18b9747801ff94f68497cd3e8dcf8 zprofile: Cleanup. Use zsh-isms consistently. --- diff --git a/zprofile b/zprofile index dba3a21..bb36fae 100644 --- a/zprofile +++ b/zprofile @@ -1,28 +1,26 @@ -# /etc/zsh/zprofile -# $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 -if [ -e /etc/profile.env ] ; then - . /etc/profile.env +# Load environment settings from profile.env, which is created by env-update +# from the files in /etc/env.d +if [[ -e /etc/profile.env ]]; then + source /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/. +# Default user settings export EDITOR=${EDITOR:-/usr/bin/vim} export PAGER=${PAGER:-/usr/bin/less} - -# 077 would be more secure, but 022 is generally quite realistic umask 022 -# Setup the default path. +# Default path path_front /{bin,sbin} /usr/{bin,sbin} /usr/local/{bin,sbin} $HOME/bin shopts=$- setopt nullglob + for sh in /etc/profile.d/*.sh ; do - [ -r "$sh" ] && . "$sh" + if [[ -r $sh ]]; then + source $sh + fi done + unsetopt nullglob set -$shopts unset sh shopts