rpms/zsh/devel zprofile.rhs, 1.7, 1.8 zsh.spec, 1.40, 1.41 zshrc.rhs, 1.11, 1.12

[James Antill (james)]

Author: james

Update of /cvs/pkgs/rpms/zsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17466

Modified Files:
	zprofile.rhs zsh.spec zshrc.rhs 
Log Message:
* Thu Jan 31 2008 James Antill <james at fedoraproject.org> - 4.3.4-7
- Tweak /etc/zshrc to source /etc/profile.d/*.sh in ksh compat. mode
- Tweak /etc/zprofile to source /etc/profile in ksh compat. mode
- Resolves: rhbz#430665



Index: zprofile.rhs
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zprofile.rhs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zprofile.rhs	9 Sep 2004 15:21:37 -0000	1.7
+++ zprofile.rhs	31 Jan 2008 14:38:48 -0000	1.8
@@ -5,7 +5,18 @@
 PATH="$PATH:$HOME/bin"
 export PATH
 
-# source profile
-if [ -f /etc/profile ]; then
-	source /etc/profile
-fi
+_src_etc_profile()
+{
+    #  Make /etc/profile happier, and have possible ~/.zshenv options like
+    # NOMATCH ignored.
+    #
+    emulate -L ksh
+
+    # source profile
+    if [ -f /etc/profile ]; then
+	    source /etc/profile
+    fi
+}
+_src_etc_profile
+
+unset -f _src_etc_profile


Index: zsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- zsh.spec	31 Jan 2008 06:26:00 -0000	1.40
+++ zsh.spec	31 Jan 2008 14:38:48 -0000	1.41
@@ -152,8 +152,9 @@
 %doc Doc/*.html
 
 %changelog
-* Thu Jan 31 2008 James Antill <james at fedoraproject.org> - 4.3.4-6
+* Thu Jan 31 2008 James Antill <james at fedoraproject.org> - 4.3.4-7
 - Tweak /etc/zshrc to source /etc/profile.d/*.sh in ksh compat. mode
+- Tweak /etc/zprofile to source /etc/profile in ksh compat. mode
 - Resolves: rhbz#430665
 
 * Mon Nov  3 2007 James Antill <jantill at redhat.com> - 4.3.4-5


Index: zshrc.rhs
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zshrc.rhs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zshrc.rhs	31 Jan 2008 06:26:00 -0000	1.11
+++ zshrc.rhs	31 Jan 2008 14:38:48 -0000	1.12
@@ -15,19 +15,24 @@
 # bindkey -e             # emacs key bindings
 bindkey ' ' magic-space  # also do history expansion on space
 
+_src_etc_profile_d()
 {
-  #  Make the *.sh things happier, and have possible ~/.zshenv options like
-  # NOMATCH ignored.
-  emulate -L ksh
+    #  Make the *.sh things happier, and have possible ~/.zshenv options like
+    # NOMATCH ignored.
+    emulate -L ksh
 
 
-# from bashrc, with zsh fixes
-if [[ ! -o login ]]; then # We're not a login shell
-    for i in /etc/profile.d/*.sh; do
-	if [ -r "$i" ]; then
-	    . $i
-	fi
-    done
-    unset i
-fi
+    # from bashrc, with zsh fixes
+    if [[ ! -o login ]]; then # We're not a login shell
+        for i in /etc/profile.d/*.sh; do
+	    if [ -r "$i" ]; then
+	        . $i
+	    fi
+        done
+        unset i
+    fi
 }
+_src_etc_profile_d
+
+unset -f _src_etc_profile_d
+