summaryrefslogtreecommitdiff
path: root/src/node/utils/Settings.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/node/utils/Settings.js')
-rw-r--r--src/node/utils/Settings.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 536c088b..7e0e6c5a 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -199,7 +199,6 @@ exports.getGitCommit = function() {
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)
{
@@ -208,6 +207,11 @@ exports.getGitCommit = function() {
return version;
}
+// Return etherpad version from package.json
+exports.getEpVersion = function() {
+ return require('ep_etherpad-lite/package.json').version;
+}
+
exports.reloadSettings = function reloadSettings() {
// Discover where the settings file lives
var settingsFilename = argv.settings || "settings.json";