Syntax fix in the shell_commands method

The built command now reflect more directly the command that is really executed by the the LMOD "module" bash function when a user execute "module load package_name/package_version".
galaxyproject · Aug 24, 2017 · 0988752 · 0988752
1 parent fed3206
commit 0988752
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/galaxy/tools/deps/resolvers/lmod.py b/lib/galaxy/tools/deps/resolvers/lmod.py
@@ -167,11 +167,11 @@ def shell_commands(self, requirement):
         # - Set the MODULEPATH environment variable
         command = 'MODULEPATH=%s; ' % (self.lmod_dependency_resolver.modulepath)
         command += 'export MODULEPATH; '
-        # - Execute the "module load" command
-        command += 'eval `%s load %s`; ' % (self.lmod_dependency_resolver.lmodexec, module_to_load)
+        # - Execute the "module load" command (or rather the "/path/to/lmod load" command)
+        command += 'eval `%s load %s` ' % (self.lmod_dependency_resolver.lmodexec, module_to_load)
         # - Execute the "settarg" command in addition if needed
         if self.lmod_dependency_resolver.settargexec is not None:
-            command += 'eval `%s -s sh`' % (self.lmod_dependency_resolver.settargexec)
+            command += '&& eval `%s -s sh`' % (self.lmod_dependency_resolver.settargexec)
 
         return command