From 41b3eabf1abe8297ff2cd96dfb2b71ebf794cbb4 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Tue, 16 Jul 2013 13:30:48 -0400
Subject: [PATCH] updating code to not use a hardcoded version number, but
 rather read the # from package.json

---
 app.js           | 6 +++---
 package.json     | 2 +-
 src/webserver.js | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 13d325ba19..cbb1e56dd9 100644
--- a/app.js
+++ b/app.js
@@ -20,9 +20,9 @@
 var fs = require('fs'),
 	path = require('path'),
 	utils = require('./public/src/utils.js'),
+	pkg = require('./package.json'),
 	url = require('url'),
 	args = {};
-global.ver = '0.0.2';
 
 // Runtime environment
 global.env = process.env.NODE_ENV || 'production',
@@ -36,7 +36,7 @@ process.argv.slice(2).forEach(function(value) {
 });
 
 // Log GNU copyright info along with server info
-console.log('Info: NodeBB v' + global.ver + ' Copyright (C) 2013 DesignCreatePlay Inc.');
+console.log('Info: NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
 console.log('Info: This program comes with ABSOLUTELY NO WARRANTY.');
 console.log('Info: This is free software, and you are welcome to redistribute it under certain conditions.');
 console.log('Info: ===');
@@ -47,7 +47,7 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
 		global.config.url = global.config.base_url + (global.config.use_port ? ':' + global.config.port : '') + '/';
 		global.config.upload_url = global.config.url + 'uploads/';
 
-		console.log('Info: Initializing NodeBB v' + global.ver + ', on port ' + global.config.port + ', using Redis store at ' + global.config.redis.host + ':' + global.config.redis.port + '.');
+		console.log('Info: Initializing NodeBB v' + pkg.version + ', on port ' + global.config.port + ', using Redis store at ' + global.config.redis.host + ':' + global.config.redis.port + '.');
 		console.log('Info: Base Configuration OK.');
 
 		var	meta = require('./src/meta.js');
diff --git a/package.json b/package.json
index 7222987df2..49a813b0e0 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   "license": "GPLv3 or later",
   "name": "NodeBB",
   "description": "NodeBB Forum",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
diff --git a/src/webserver.js b/src/webserver.js
index fca2800e1f..0d68b657f2 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -8,6 +8,7 @@ var express = require('express'),
 	redisServer = redis.createClient(global.config.redis.port, global.config.redis.host),
 	marked = require('marked'),
 	utils = require('../public/src/utils.js'),
+	pkg = require('../package.json'),
 	fs = require('fs'),
 	
 	user = require('./user.js'),
@@ -304,7 +305,7 @@ var express = require('express'),
 						
 						async.each(data.categories, iterator, function(err) {
 							data.motd_class = (config.show_motd === '1' || config.show_motd === undefined) ? '' : 'none';
-							data.motd = marked(config.motd || "# NodeBB v" + global.ver + "\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i> Get NodeBB</a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i> Fork us on Github</a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i> @dcplabs</a>");
+							data.motd = marked(config.motd || "# NodeBB v" + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i> Get NodeBB</a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i> Fork us on Github</a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i> @dcplabs</a>");
 							res.json(data);							
 						});