Merge pull request #1078 from OpenAF/t8

T8

Author: nmaguiar

js/genSB.js

@@ -3,22 +3,30 @@
 
 var tmpl = "#!/usr/bin/env {{openAFPath}}oaf-sb\n\nvar params = processExpr(\" \");\n// sprint(params)\n\n";
 var tmplJ = "#!/usr/bin/env {{openAFPath}}ojob-sb\n\n"
+var tmplP = "#!/usr/bin/env {{openAFPath}}oafp-sb\n"
 
-var isoJob = false
+var isoJob = false, isoafp = false
 var isWin = String(java.lang.System.getProperty("os.name")).match(/Windows/)
 if (io.fileExists(expr)) {
-    if (!expr.endsWith(".js")) isoJob = true
+    if (!expr.endsWith(".js")) {
+        if (expr.endsWith(".yaml") || expr.endsWith(".json") || expr.endsWith(".yml")) 
+            isoJob = true
+        else
+            isoafp = true
+    }
     if (io.readFileString(expr).replace(/\n/g, "").trim().substring(0, 2) == "#!") 
         logWarn("Shebang entry on file '" + expr + "' detected. Ignoring request.");
     else {
-        io.writeFileString(expr, templify((isoJob ? tmplJ : tmpl), {
+        io.writeFileString(expr, templify((isoJob ? tmplJ : (isoafp ? tmplP : tmpl)), {
             openAFPath: getOpenAFPath()
         }) + io.readFileString(expr));
         if (!isWin) $sh("chmod u+x " + expr)
                     .prefix("chmod")
                     .get(0)
-        log("Pre-appended " + (isoJob ? "oJob" : "OpenAF") + " shebang instructions to file: " + expr);
-        if (!isoJob) log("On OpenAF use the 'params' variable to access any parameter you pass executing the script like: " + io.fileInfo(expr).canonicalPath + " abc=123 xzy=aaa");
+        log("Pre-appended " + (isoJob ? "oJob" : (isoafp ? "oafp" : "OpenAF")) + " shebang instructions to file: " + expr);
+        if (!isoJob && !isoafp) {
+            log("On OpenAF use the 'params' variable to access any parameter you pass executing the script like: " + io.fileInfo(expr).canonicalPath + " abc=123 xzy=aaa");
+        }
     }
 } else {
     // No file exists

js/genScripts.js

@@ -334,7 +334,7 @@ var winJobBat = generateWinJobBat();
 var winConsoleBat = generateWinConsoleBat();
 //var winConsolePSBat = generateWinConsolePSBat();
 
-var unixScript, unixSB, unixSBoJob, unixPackScript, unixJobScript, unixConsoleScript, unixUpdateScript, unixOAFPScript
+var unixScript, unixSB, unixSBoJob, unixSBoafp, unixPackScript, unixJobScript, unixConsoleScript, unixUpdateScript, unixOAFPScript
 
 //if (windows == 0) {
   unixScript = generateUnixScript("\"$@\"")
@@ -344,6 +344,7 @@ var unixScript, unixSB, unixSBoJob, unixPackScript, unixJobScript, unixConsoleSc
   unixJobScript = generateUnixScript("--ojob -e \"$SCRIPT $ARGS\"", true)
   unixConsoleScript = generateUnixScript("--console \"$@\"", __, __, true)
   unixOAFPScript = generateUnixScript("-c \"load(getOpenAFJar()+'::js/oafp.js')\" -e \"$ARGS\"")
+  unixSBoafp = generateUnixScript("-c \"load(getOpenAFJar()+'::js/oafp.js')\" -e \"_shebang=true $OAFP_ARGS $ARGS\"")
   unixUpdateScript = generateUnixScript("--update", void 0, __genScriptsUpdate);
 //}
 
@@ -365,6 +366,7 @@ try {
   io.writeFileString(curDir + "/openaf-sb", unixSB);
   io.writeFileString(curDir + "/oaf-sb", unixSB);
   io.writeFileString(curDir + "/ojob-sb", unixSBoJob);
+  io.writeFileString(curDir + "/oafp-sb", unixSBoafp)
   io.writeFileString(curDir + "/opack", unixPackScript);
   io.writeFileString(curDir + "/ojob", unixJobScript);
   io.writeFileString(curDir + "/openaf-console", unixConsoleScript);
@@ -382,6 +384,7 @@ if (windows == 0) {
     sh("chmod a+x " + curDir + "/openaf-sb", "", null, false);
     sh("chmod a+x " + curDir + "/oaf-sb", "", null, false);
     sh("chmod a+x " + curDir + "/ojob-sb", "", null, false);
+    sh("chmod a+x " + curDir + "/oafp-sb", "", null, false)
 	  sh("chmod a+x " + curDir + "/opack", "", null, false);
 	  sh("chmod a+x " + curDir + "/ojob", "", null, false);
 	  sh("chmod a+x " + curDir + "/openaf-console", "", null, false);