diff --git a/red.js b/red.js index 874778714..f9ff34bc1 100644 --- a/red.js +++ b/red.js @@ -44,6 +44,7 @@ nopt.invalidHandler = function(k,v,t) { var parsedArgs = nopt(knownOpts,shortHands,process.argv,2) if (parsedArgs.help) { + console.log("Node-RED v"+RED.version()); console.log("Usage: node red.js [-v] [-?] [--settings settings.js] [flows.json]"); console.log(""); console.log("Options:"); diff --git a/red/red.js b/red/red.js index 5e5641930..fa7f0745b 100644 --- a/red/red.js +++ b/red/red.js @@ -18,6 +18,7 @@ var events = require("./events"); var server = require("./server"); var nodes = require("./nodes"); var library = require("./library"); +var fs = require("fs"); var settings = null; var path = require('path'); @@ -34,6 +35,15 @@ var RED = { library.init(); return server.app; }, + + version: function() { + var p = require(path.join(process.env.NODE_RED_HOME,"package.json")); + if (fs.existsSync(path.join(process.env.NODE_RED_HOME,".git"))) { + return p.version+".git"; + } else { + return p.version; + } + }, start: server.start, stop: server.stop, diff --git a/red/server.js b/red/server.js index 2b6b62b22..8eadad272 100644 --- a/red/server.js +++ b/red/server.js @@ -63,10 +63,12 @@ function createServer(_server,_settings) { } function start() { + var RED = require("./red"); var defer = when.defer(); storage.init(settings).then(function() { console.log("\nWelcome to Node-RED\n===================\n"); + util.log("[red] Version: "+RED.version()); util.log("[red] Loading palette nodes"); var nodeErrors = redNodes.load(settings); if (nodeErrors.length > 0) {