+objOrStr

ow.oJob: shellPrefix using objOrStr

Author: nmaguiar

js/openaf.js

@@ -2367,6 +2367,20 @@ function beep() {
 	Packages.java.awt.Toolkit.getDefaultToolkit().beep();
 }
 
+/**
+ * <odoc>
+ * <key>objOrStr(aObj, aStr) : String</key>
+ * Given aObj (a map or an array) will try to assess if aStr is an aObj key (using $$.get).
+ * If yes, it will return the corresponding aObj value otherwise it will return aStr.
+ * </odoc>
+ */
+function objOrStr(aObj, aStr) {
+    if (!isMap(aObj) && !isArray(aObj)) return aStr;
+	var r = $$(aObj).get(aStr);
+	if (isUnDef(r)) r = aStr;
+	return r;
+}
+
 /**
  * <odoc>
  * <key>watch(waitFor, aCommand, beautifyFlag, noPrint)</key>

js/owrap.oJob.js

@@ -1911,7 +1911,7 @@ OpenWrap.oJob.prototype.addJob = function(aJobsCh, _aName, _jobDeps, _jobType, _
 					}
 					var prefix = "";
 					if (isString(aJobTypeArgs.shellPrefix)) {
-						prefix = ".prefix(eval(\"" + parent.__processTypeArg(aJobTypeArgs.shellPrefix) + "\"))";
+						prefix = ".prefix(objOrStr(args, \"" + parent.__processTypeArg(aJobTypeArgs.shellPrefix) + "\"))";
 					}
 					res += "var __uuid = '.' + genUUID() + '.bat'; _$(args.ssh, 'ssh').isMap().$_(); var __res = $ssh(args.ssh).putFile(ft, __uuid).sh(" + stringify(aJobTypeArgs.shell) + " + ' ' + __uuid)" + prefix + ".exit((r, s)=>s.rm(__uuid)).get(0); io.rm(ft);\n";
 					res += "if (!isNull(__res.stdout)) if (isMap(jsonParse(__res.stdout, true))) { args = merge(args, jsonParse(__res.stdout, true)) } else { if (__res.stdout.length > 0) { printnl(__res.stdout) }; if (__res.stderr.length > 0) { printErrnl(__res.stderr); } }";
@@ -1922,7 +1922,7 @@ OpenWrap.oJob.prototype.addJob = function(aJobsCh, _aName, _jobDeps, _jobType, _
 				if (!(res.indexOf("/* __oaf_ojob shell */") >= 0)) {
 					var prefix = "";
 					if (isString(aJobTypeArgs.shellPrefix)) {
-						prefix = ".prefix(eval(\"" + parent.__processTypeArg(aJobTypeArgs.shellPrefix) + "\"))";
+						prefix = ".prefix(objOrStr(args, \"" + parent.__processTypeArg(aJobTypeArgs.shellPrefix) + "\"))";
 					}
 					if (ow.format.isWindows() && isUnDef(aJobTypeArgs.shell)) {
 						var orig = String(res);
@@ -1970,7 +1970,7 @@ OpenWrap.oJob.prototype.addJob = function(aJobsCh, _aName, _jobDeps, _jobType, _
 							var orig = String(res);
 							var prefix = "";
 							if (isString(aJobTypeArgs.shellPrefix)) {
-								prefix = ".prefix(eval(\"" + parent.__processTypeArg(aJobTypeArgs.shellPrefix) + "\"))";
+								prefix = ".prefix(objOrStr(args, \"" + parent.__processTypeArg(aJobTypeArgs.shellPrefix) + "\"))";
 							}
                             res = "/* __oaf_ojob shell */ ";
 							if (aJobTypeArgs.noTemplate) {