forked from coolaj86/goldilocks.js
fix paths
This commit is contained in:
parent
945ce26b39
commit
05ebdfab98
|
@ -92,7 +92,7 @@ function createServer(port, pubdir, content, opts) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return new PromiseA(function (realResolve) {
|
return new PromiseA(function (realResolve) {
|
||||||
var app = require('./lib/app.js');
|
var app = require('../lib/app.js');
|
||||||
|
|
||||||
var directive = { public: pubdir, content: content, livereload: opts.livereload
|
var directive = { public: pubdir, content: content, livereload: opts.livereload
|
||||||
, servername: opts.servername, expressApp: opts.expressApp };
|
, servername: opts.servername, expressApp: opts.expressApp };
|
||||||
|
@ -231,7 +231,7 @@ function run() {
|
||||||
if (argv.v) {
|
if (argv.v) {
|
||||||
console.warn("flag -v is reserved for future use. Use -V or --version for version information.");
|
console.warn("flag -v is reserved for future use. Use -V or --version for version information.");
|
||||||
}
|
}
|
||||||
console.info('v' + require('./package.json').version);
|
console.info('v' + require('../package.json').version);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -399,12 +399,12 @@ function run() {
|
||||||
|
|
||||||
if (!(argv.servername && defaultServername !== argv.servername && !(argv.key && argv.cert))) {
|
if (!(argv.servername && defaultServername !== argv.servername && !(argv.key && argv.cert))) {
|
||||||
// ifaces
|
// ifaces
|
||||||
opts.ifaces = require('./lib/local-ip.js').find();
|
opts.ifaces = require('../lib/local-ip.js').find();
|
||||||
promise = PromiseA.resolve();
|
promise = PromiseA.resolve();
|
||||||
} else {
|
} else {
|
||||||
console.info("Attempting to resolve external connection for '" + argv.servername + "'");
|
console.info("Attempting to resolve external connection for '" + argv.servername + "'");
|
||||||
try {
|
try {
|
||||||
promise = require('./lib/match-ips.js').match(argv.servername, opts);
|
promise = require('../lib/match-ips.js').match(argv.servername, opts);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
console.warn("Upgrade to version 2.x to use automatic certificate issuance for '" + argv.servername + "'");
|
console.warn("Upgrade to version 2.x to use automatic certificate issuance for '" + argv.servername + "'");
|
||||||
promise = PromiseA.resolve();
|
promise = PromiseA.resolve();
|
||||||
|
@ -446,10 +446,10 @@ function run() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts.tunnel) {
|
if (opts.tunnel) {
|
||||||
require('./lib/tunnel.js').create(opts, servers);
|
require('../lib/tunnel.js').create(opts, servers);
|
||||||
}
|
}
|
||||||
else if (opts.ddns) {
|
else if (opts.ddns) {
|
||||||
require('./lib/ddns.js').create(opts, servers);
|
require('../lib/ddns.js').create(opts, servers);
|
||||||
}
|
}
|
||||||
|
|
||||||
Object.keys(opts.ifaces).forEach(function (iname) {
|
Object.keys(opts.ifaces).forEach(function (iname) {
|
||||||
|
|
Loading…
Reference in New Issue