From a163fccc9ed8ae685cf8348eaf550b417cead3a7 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Fri, 23 Oct 2009 18:21:24 +0000
Subject: [PATCH] - Don't load bash init script when bash is running as "sh"
 (bug #529745)

---
 environment-modules.spec | 5 ++++-
 modules.sh               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/environment-modules.spec b/environment-modules.spec
index 83126e0..6fc11e7 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-4
+- Don't load bash init script when bash is running as "sh" (bug #529745)
+
 * Mon Oct 19 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-3
 - Support different flavors of "sh" (bug #529493)
 
diff --git a/modules.sh b/modules.sh
index b71117a..fd98eaf 100644
--- a/modules.sh
+++ b/modules.sh
@@ -1 +1 @@
-. /usr/share/Modules/init/`basename $SHELL`
+. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``