diff --git a/pulsar/managers/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh b/pulsar/managers/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh index eadad98eaf4007726e1d50223be10e2cbfce1d70..0c533ce0c538d16b10400eaa9e64c68903cbab64 100644 --- a/pulsar/managers/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh +++ b/pulsar/managers/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh @@ -1,5 +1,4 @@ #!$shell - $integrity_injection $headers $slots_statement diff --git a/pulsar/managers/util/job_script/__init__.py b/pulsar/managers/util/job_script/__init__.py index 9f144dc51a447e5119558ca6990cacf2c8970666..fffd29fe150d416ff8780f8f1695dc5ce825e93f 100644 --- a/pulsar/managers/util/job_script/__init__.py +++ b/pulsar/managers/util/job_script/__init__.py @@ -62,10 +62,12 @@ def job_script(template=DEFAULT_JOB_FILE_TEMPLATE, **kwds): True >>> 'GALAXY_LIB="None"' in script True - >>> script.startswith('#!/bin/sh\\n#PBS -test\\n') + >>> script.startswith('#!/bin/bash\\n\\n# The following block can be used by the job system') + True + >>> 'PBS -test\\n' in script False - >>> script = job_script(working_directory='wd', command='uptime', exit_code_path='ec', headers='#PBS -test') - >>> script.startswith('#!/bin/sh\\n#PBS -test\\n') + >>> script = job_script(working_directory='wd', command='uptime', exit_code_path='ec', headers='#PBS -test', integrity_injection='') + >>> script.startswith('#!/bin/bash\\n\\n#PBS -test\\n') True >>> script = job_script(working_directory='wd', command='uptime', exit_code_path='ec', slots_statement='GALAXY_SLOTS="$SLURM_JOB_NUM_NODES"') >>> script.find('GALAXY_SLOTS="$SLURM_JOB_NUM_NODES"\\nexport GALAXY_SLOTS\\n') > 0