rpms/environment-modules/F-12 environment-modules.spec, 1.26, 1.27 modules.sh, 1.2, 1.3

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1109

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-5
- Don't assume different shell init scripts exist (bug #530770)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/environment-modules.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- environment-modules.spec	23 Oct 2009 18:22:16 -0000	1.26
+++ environment-modules.spec	26 Oct 2009 16:55:06 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-5
+- Don't assume different shell init scripts exist (bug #530770)
+
 * Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
 - Don't load bash init script when bash is running as "sh" (bug #529745)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/modules.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- modules.sh	23 Oct 2009 18:22:17 -0000	1.2
+++ modules.sh	26 Oct 2009 16:55:07 -0000	1.3
@@ -1 +1,7 @@
-. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``
+shell=`/bin/basename \`/bin/ps -p $$ -ocomm=\``
+if [ -f /usr/share/Modules/init/$shell ]
+then
+  . /usr/share/Modules/init/$shell
+else
+  . /usr/share/Modules/init/sh
+fi