Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-26 22:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #592 from williamboman/fix/git-describe

Browse source 
consolidate version numbers throughout all interfaces
This commit is contained in:
Pavel Djundik 2016-10-15 14:06:52 +03:00 committed by GitHub
commit db1dc3675a
4 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client.js
View file

@ -257,7 +257,7 @@ Client.prototype.connect = function(args) {
});
network.irc.connect({
version: pkg.name + " " + pkg.version + " -- " + pkg.homepage,
version: pkg.name + " " + Helper.getVersion() + " -- " + pkg.homepage,
host: network.host,
port: network.port,
nick: nick,

3
src/command-line/index.js
View file

@ -3,13 +3,12 @@
global.log = require("../log.js");
var program = require("commander");
var pkg = require("../../package.json");
var fs = require("fs");
var fsextra = require("fs-extra");
var path = require("path");
var Helper = require("../helper");
program.version(pkg.version, "-v, --version");
program.version(Helper.getVersion(), "-v, --version");
program.option("");
program.option(" --home <path>" , "home path");

26
src/helper.js
View file

@ -1,5 +1,6 @@
"use strict";
const pkg = require("../package.json");
var _ = require("lodash");
var path = require("path");
var os = require("os");
@ -11,6 +12,8 @@ var Helper = {
getUserConfigPath: getUserConfigPath,
getUserLogsPath: getUserLogsPath,
setHome: setHome,
getVersion: getVersion,
getGitCommit: getGitCommit,
};
module.exports = Helper;
@ -22,6 +25,29 @@ Helper.config = require(path.resolve(path.join(
"config.js"
)));
function getVersion() {
const gitCommit = getGitCommit();
return gitCommit ? `source (${gitCommit})` : `v${pkg.version}`;
}
let _gitCommit;
function getGitCommit() {
if (_gitCommit !== undefined) {
return _gitCommit;
}
try {
_gitCommit = require("child_process")
.execSync("git rev-parse --short HEAD 2> /dev/null") // Returns hash of current commit
.toString()
.trim();
return _gitCommit;
} catch (e) {
// Not a git repository or git is not installed
_gitCommit = null;
return null;
}
}
function setHome(homePath) {
this.HOME = expandHome(homePath || "~/.lounge");
this.CONFIG_PATH = path.join(this.HOME, "config.js");

19
src/server.js
View file

@ -81,8 +81,10 @@ module.exports = function() {
manager.sockets = sockets;
var protocol = config.https.enable ? "https" : "http";
log.info("The Lounge v" + pkg.version + " is now running on", protocol + "://" + (config.host || "*") + ":" + config.port + "/", (config.public ? "in public mode" : "in private mode"));
let protocol = config.https.enable ? "https" : "http";
let host = config.host || "*";
log.info("The Lounge", Helper.getVersion(), "is now running");
log.info(`Available on: ${protocol}://${host}:${config.port}/ in ${config.public ? "public" : "private"} mode`);
log.info("Press ctrl-c to stop\n");
if (!config.public) {
@ -110,17 +112,6 @@ function allRequests(req, res, next) {
return next();
}
// Information to populate the About section in UI, either from npm or from git
var gitCommit = null;
try {
gitCommit = require("child_process")
.execSync("git rev-parse --short HEAD 2> /dev/null") // Returns hash of current commit
.toString()
.trim();
} catch (e) {
// Not a git repository or git is not installed: treat it as npm release
}
function index(req, res, next) {
if (req.url.split("?")[0] !== "/") {
return next();
@ -135,7 +126,7 @@ function index(req, res, next) {
pkg,
Helper.config
);
data.gitCommit = gitCommit;
data.gitCommit = Helper.getGitCommit();
data.themes = fs.readdirSync("client/themes/").filter(function(themeFile) {
return themeFile.endsWith(".css");
}).map(function(css) {