fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix for git version extraction code

This commit is contained in:
Egil Moeller 2012-02-26 14:14:54 +01:00
parent da52353ba3
commit ac7ad6b519
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/server.js
View File

@ -30,14 +30,15 @@ var path = require('path');
require("./pluginfw/require"); // Load globals require("./pluginfw/require"); // Load globals
var plugins = require("./pluginfw/plugins"); var plugins = require("./pluginfw/plugins");
var hooks = require("./pluginfw/hooks"); var hooks = require("./pluginfw/hooks");
var npm = require("npm/lib/npm.js");
//try to get the git version //try to get the git version
var version = ""; var version = "";
try try
{ {
var rootPath = path.normalize(__dirname + "/../") var rootPath = path.resolve(npm.dir, '..');
var ref = fs.readFileSync(rootPath + ".git/HEAD", "utf-8"); var ref = fs.readFileSync(rootPath + "/.git/HEAD", "utf-8");
var refPath = rootPath + ".git/" + ref.substring(5, ref.indexOf("\n")); var refPath = rootPath + "/.git/" + ref.substring(5, ref.indexOf("\n"));
version = fs.readFileSync(refPath, "utf-8"); version = fs.readFileSync(refPath, "utf-8");
version = version.substring(0, 7); version = version.substring(0, 7);
console.log("Your Etherpad Lite git version is " + version); console.log("Your Etherpad Lite git version is " + version);