opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-13 16:57:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new action to create_or_update_env_shell_file for sourcing other env.sh files.

Browse Source 
With unit test.
This commit is contained in:
John Chilton
2013-11-14 10:39:49 -06:00
parent 2c1c4c1472
commit 716d66564e
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py
+13 -8
View File
@@ -146,16 +146,21 @@ def create_env_var_dict( elem, tool_dependency_install_dir=None, tool_shed_repos
return None
def create_or_update_env_shell_file( install_dir, env_var_dict ):
env_var_name = env_var_dict[ 'name' ]
env_var_action = env_var_dict[ 'action' ]
env_var_value = env_var_dict[ 'value' ]
if env_var_action == 'prepend_to':
changed_value = '%s:$%s' % ( env_var_value, env_var_name )
elif env_var_action == 'set_to':
changed_value = '%s' % env_var_value
elif env_var_action == 'append_to':
changed_value = '$%s:%s' % ( env_var_name, env_var_value )
line = "%s=%s; export %s" % ( env_var_name, changed_value, env_var_name )
if env_var_action in ['prepend_to', 'set_to', 'append_to']:
env_var_name = env_var_dict[ 'name' ]
if env_var_action == 'prepend_to':
changed_value = '%s:$%s' % ( env_var_value, env_var_name )
elif env_var_action == 'set_to':
changed_value = '%s' % env_var_value
elif env_var_action == 'append_to':
changed_value = '$%s:%s' % ( env_var_name, env_var_value )
line = "%s=%s; export %s" % ( env_var_name, changed_value, env_var_name )
elif env_var_action == "source":
line = ". %s" % env_var_value
else:
raise Exception( "Unknown shell file action %s" % env_var_action )
env_shell_file_path = os.path.join( install_dir, 'env.sh' )
return line, env_shell_file_path
test/unit/tool_shed/test_td_common_util.py
+4
View File
@@ -29,6 +29,10 @@ def test_create_or_update_env_shell_file( ):
assert path == join( TEST_INSTALL_DIR, "env.sh" )
assert line == "R_LIBS=/usr/share/R/libs; export R_LIBS"
line, path = td_common_util.create_or_update_env_shell_file( TEST_INSTALL_DIR, dict(action="source", value=test_path))
assert path == join( TEST_INSTALL_DIR, "env.sh" )
assert line == ". /usr/share/R/libs"
def test_parse_setup_environment_repositories( ):
xml = """<action name="setup_r_environment">