X-Git-Url: https://git.draconx.ca/gitweb/zshconf.git/blobdiff_plain/032e5318aaf40a821c2b3a99bc558306b3e58e0c..444e9cc97af7f2644efc56409365f19d3ffe89e4:/zprofile?ds=sidebyside

diff --git a/zprofile b/zprofile
index 2a4978d..bb36fae 100644
--- a/zprofile
+++ b/zprofile
@@ -1,41 +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
 
-# 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
-	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
-else
-	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
-fi
-export PATH="$HOME/bin:$PATH"
-unset ROOTPATH
+# 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