Enable java environments check

kaola-fed · Dec 24, 2016 · c578566 · c578566
1 parent d0759c9
commit c578566
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/app.js b/src/app.js
@@ -4,6 +4,10 @@ const path = require('path');
 const crypto = require('crypto');
 const execFile = require('child_process').execFile;
 
+const javaVersion = (callback) => {
+  execFile('java', ['-version'], callback);
+};
+
 class Freemarker {
   constructor(options = {}) {
     this.tmpDir = os.tmpdir();
@@ -68,13 +72,16 @@ class Freemarker {
     };
     this._writeData(tddFile, data);
     this._writeConfig(configFile, config);
-    execFile(this.cmd, [ftl, '-C', configFile], (err, log) => {
-      let result = '';
-      if (fs.existsSync(htmlFile)) {
-        result = fs.readFileSync(htmlFile, 'utf8');
-      }
-      callback(err? log: null, result);
-      this._cleanFiles([htmlFile, tddFile, configFile]);
+    javaVersion(err => {
+      if (err) return callback('Java is not set properly!');
+      execFile(this.cmd, [ftl, '-C', configFile], (err, log) => {
+        let result = '';
+        if (fs.existsSync(htmlFile)) {
+          result = fs.readFileSync(htmlFile, 'utf8');
+        }
+        callback(err? log: null, result);
+        this._cleanFiles([htmlFile, tddFile, configFile]);
+      });
     });
   }
 };