Repository: airavata Updated Branches: refs/heads/develop a94a7ca9d -> 9eede35ba
Improved part of pbs groovy template logic Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9eede35b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9eede35b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9eede35b Branch: refs/heads/develop Commit: 9eede35bad7c6865bcdb3b125c79e97c2c982e98 Parents: a94a7ca Author: Shameera Rathnayaka <[email protected]> Authored: Tue Dec 13 12:10:23 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Dec 13 12:10:23 2016 -0500 ---------------------------------------------------------------------- .../server/src/main/resources/PBS_Groovy.template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9eede35b/modules/configuration/server/src/main/resources/PBS_Groovy.template ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/PBS_Groovy.template b/modules/configuration/server/src/main/resources/PBS_Groovy.template index 4056910..a1d01e6 100644 --- a/modules/configuration/server/src/main/resources/PBS_Groovy.template +++ b/modules/configuration/server/src/main/resources/PBS_Groovy.template @@ -22,8 +22,12 @@ if (moduleCommands != null) for(mc in moduleCommands) out.print mc +'\n' if (workingDirectory != null && workingDirectory != "") out.print 'cd ' + workingDirectory +'\n' if (preJobCommands != null) for(pjc in preJobCommands) out.print pjc +'\n' - if (jobSubmitterCommand != null && jobSubmitterCommand != "") out.print jobSubmitterCommand + ' ' - if (jobSubmitterCommand != "ccmrun" && jobSubmitterCommand != "") out.print cpuCount + ' ' + if (jobSubmitterCommand != null && jobSubmitterCommand != ""){ + out.print jobSubmitterCommand + ' ' + if(jobSubmitterCommand != "ccmrun"){ + out.print cpuCount + ' ' + } + } if (executablePath != null && executablePath != "") out.print executablePath + ' ' if (inputs != null) for(input in inputs) out.print input + ' ' out.print '\n'
