summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2007-05-07 06:51:11 +0000
committerMamoru Komachi <usata@gentoo.org>2007-05-07 06:51:11 +0000
commit3703e9875c5a80939ce4abed4c72305d18401744 (patch)
tree30d3d58ca6cfcc0eb25898e93849c52bf5200c41 /app-shells/zsh/files
parentadd cross-compile workaround for linux targets #177061 (diff)
downloadhistorical-3703e9875c5a80939ce4abed4c72305d18401744.tar.gz
historical-3703e9875c5a80939ce4abed4c72305d18401744.tar.bz2
historical-3703e9875c5a80939ce4abed4c72305d18401744.zip
Set nullglob to kill a warning when there are no scripts in /etc/profile.d. See bug #176994.
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'app-shells/zsh/files')
-rw-r--r--app-shells/zsh/files/digest-zsh-4.3.2-r16
-rw-r--r--app-shells/zsh/files/zprofile8
2 files changed, 6 insertions, 8 deletions
diff --git a/app-shells/zsh/files/digest-zsh-4.3.2-r1 b/app-shells/zsh/files/digest-zsh-4.3.2-r1
deleted file mode 100644
index 5acb23db53a4..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.3.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 69d1ab9d179d7d16eb0251a0a60e0457 zsh-4.3.2-doc.tar.bz2 2207375
-RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff zsh-4.3.2-doc.tar.bz2 2207375
-SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f zsh-4.3.2-doc.tar.bz2 2207375
-MD5 e13fc4bb338fbb27ef7508a474310c8f zsh-4.3.2.tar.bz2 2263544
-RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e zsh-4.3.2.tar.bz2 2263544
-SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 zsh-4.3.2.tar.bz2 2263544
diff --git a/app-shells/zsh/files/zprofile b/app-shells/zsh/files/zprofile
index 69cae0b39ff0..bec0e52fd3b4 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.3 2007/04/30 16:26:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.4 2007/05/07 06:51:11 usata Exp $
# Load environment settings from profile.env, which is created by
# env-update from the files in /etc/env.d
@@ -31,9 +31,13 @@ unset ROOTPATH
[ -z "$EDITOR" ] && EDITOR="/bin/nano"
export EDITOR
+shopts=$-
+setopt nullglob
for sh in /etc/profile.d/*.sh ; do
if [ -r "$sh" ] ; then
. "$sh"
fi
done
-unset sh
+unsetopt nullglob
+set -$shopts
+unset sh shopts