working, need to test though

2 files changed, 4 insertions, 18 deletions

diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js
index e858b800..3275bd3f 100644
--- a/src/node/hooks/express.js
+++ b/src/node/hooks/express.js
@@ -10,24 +10,9 @@ var server;
 var serverName;
 
 exports.createServer = function () {
-  //try to get the git version
-  var version = "";
-  try
-  {
-    var rootPath = path.resolve(npm.dir, '..');
-    var ref = fs.readFileSync(rootPath + "/.git/HEAD", "utf-8");
-    var refPath = rootPath + "/.git/" + ref.substring(5, ref.indexOf("\n"));
-    version = fs.readFileSync(refPath, "utf-8");
-    version = version.substring(0, 7);
-    console.log("Your Etherpad git version is " + version);
-  }
-  catch(e) 
-  {
-    console.warn("Can't get git version for server header\n" + e.message)
-  }
   console.log("Report bugs at https://github.com/ether/etherpad-lite/issues")
 
-  serverName = "Etherpad " + version + " (http://etherpad.org)";
+  serverName = "Etherpad " + settings.getGitCommit() + " (http://etherpad.org)";
 
   exports.restartServer();
 
@@ -38,7 +23,6 @@ exports.createServer = function () {
   else{
     console.warn("Admin username and password not set in settings.json.  To access admin please uncomment and edit 'users' in settings.json");
   }
-
 }
 
 exports.restartServer = function () {
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js
index 34eafd0b..5015cc5a 100644
--- a/src/node/hooks/express/adminplugins.js
+++ b/src/node/hooks/express/adminplugins.js
@@ -1,4 +1,5 @@
 var eejs = require('ep_etherpad-lite/node/eejs');
+var settings = require('ep_etherpad-lite/node/utils/Settings');
 var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
 var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
 var _ = require('underscore');
@@ -15,7 +16,8 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins.html", render_args) );
   });
   args.app.get('/admin/plugins/info', function(req, res) {
-    res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", {}) );
+    var gitCommit = settings.getGitCommit();
+    res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", {gitCommit:gitCommit}) );
   });
 }