github.com/verdaccio
1
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2025-02-21 07:29:37 +01:00
Code Releases Wiki Activity

Merge pull request #14 from steve-p-com/master

Browse Source 
Fix missing version numbers
This commit is contained in:
Trent Earl 2016-04-26 12:21:07 -05:00
commit 2c76a5f8ac
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cli.js
View File

@ -29,11 +29,13 @@ var URL = require('url')
var server = require('./index')
var Utils = require('./utils')
var pkginfo = require('pkginfo')(module); // eslint-disable-line no-unused-vars
var pkgVersion = module.exports.version
var pkgName = module.exports.name
commander
.option('-l, --listen <[host:]port>', 'host:port number to listen on (default: localhost:4873)')
.option('-c, --config <config.yaml>', 'use this configuration file (default: ./config.yaml)')
.version(module.exports.version)
.version(pkgVersion)
.parse(process.argv)
if (commander.args.length == 1 && !commander.config) {
@ -160,7 +162,7 @@ function afterConfigLoad() {
pathname: '/',
})
),
version: 'Sinopia/'+module.exports.version,
version: pkgName + '/' + pkgVersion,
}, 'http address - @{addr}')
})

6
lib/config.js
View File

@ -6,7 +6,9 @@ var Path = require('path')
var LocalData = require('./local-data')
var Utils = require('./utils')
var Utils = require('./utils')
var pkginfo = require('pkginfo')(module); // eslint-disable-line no-unused-vars
var pkginfo = require('pkginfo')(module) // eslint-disable-line no-unused-vars
var pkgVersion = module.exports.version
var pkgName = module.exports.name
// [[a, [b, c]], d] -> [a, b, c, d]
function flatten(array) {
@ -26,7 +28,7 @@ function Config(config) {
for (var i in config) {
if (self[i] == null) self[i] = config[i]
}
if (!self.user_agent) self.user_agent = 'Sinopia/'+module.exports.version
if (!self.user_agent) self.user_agent = pkgName + '/' + pkgVersion
// some weird shell scripts are valid yaml files parsed as string
assert.equal(typeof(config), 'object', 'CONFIG: it doesn\'t look like a valid config file')