v0.20.8: fix npmPrefixPath
This commit is contained in:
parent
8589a66fca
commit
909b479265
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "telebit",
|
"name": "telebit",
|
||||||
"version": "0.20.6",
|
"version": "0.20.8",
|
||||||
"description": "Break out of localhost. Connect to any device from anywhere over any tcp port or securely in a browser. A secure tunnel. A poor man's reverse VPN.",
|
"description": "Break out of localhost. Connect to any device from anywhere over any tcp port or securely in a browser. A secure tunnel. A poor man's reverse VPN.",
|
||||||
"main": "lib/remote.js",
|
"main": "lib/remote.js",
|
||||||
"files": [
|
"files": [
|
||||||
|
|
|
@ -114,8 +114,8 @@ Launcher.install = function (things, fn) {
|
||||||
};
|
};
|
||||||
vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
|
vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
|
||||||
vars.telebitNpm = path.resolve(vars.telebitNode, '../npm');
|
vars.telebitNpm = path.resolve(vars.telebitNode, '../npm');
|
||||||
vars.nodePath = path.resolve(vars.telebitNode, '../lib/node_modules');
|
vars.nodePath = path.resolve(vars.telebitNode, '../../lib/node_modules');
|
||||||
vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..');
|
vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..', '..');
|
||||||
vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
|
vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
|
||||||
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
||||||
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
||||||
|
|
|
@ -79,8 +79,8 @@ function run() {
|
||||||
, TELEBIT_LOG_DIR: process.env.TELEBIT_LOG_DIR || path.join(os.homedir(), '.local/share/telebit/var/log')
|
, TELEBIT_LOG_DIR: process.env.TELEBIT_LOG_DIR || path.join(os.homedir(), '.local/share/telebit/var/log')
|
||||||
};
|
};
|
||||||
vars.telebitNpm = process.env.TELEBIT_NPM || path.resolve(vars.telebitNode, '../npm');
|
vars.telebitNpm = process.env.TELEBIT_NPM || path.resolve(vars.telebitNode, '../npm');
|
||||||
vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../lib/node_modules');
|
vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../../lib/node_modules');
|
||||||
vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..');
|
vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..', '..');
|
||||||
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
||||||
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue