From b74c1c5f83dc8cb9bfde3c542ac07137eb2af3f1 Mon Sep 17 00:00:00 2001 From: Marcus Christie Date: Thu, 9 Nov 2017 17:08:40 -0500 Subject: [PATCH] AIRAVATA-2590 Only add processPerNode if there is a jobSubmitterCommand --- .../server/src/main/resources/UGE_Groovy.template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/configuration/server/src/main/resources/UGE_Groovy.template b/modules/configuration/server/src/main/resources/UGE_Groovy.template index ce378f984e..2870401b9f 100644 --- a/modules/configuration/server/src/main/resources/UGE_Groovy.template +++ b/modules/configuration/server/src/main/resources/UGE_Groovy.template @@ -20,8 +20,10 @@ 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 (processPerNode != null && processPerNode != "") out.print processPerNode + ' ' + if (jobSubmitterCommand != null && jobSubmitterCommand != "") { + out.print jobSubmitterCommand + ' ' + if (processPerNode != null && processPerNode != "") out.print processPerNode + ' ' + } if (executablePath != null && executablePath != "") out.print executablePath + ' ' if (inputs != null) for(input in inputs) out.print input + ' ' out.print '\n'