From 909b47926593fe895b2c91a6f1b7db9adb7f3b74 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 9 Oct 2018 16:30:10 -0600 Subject: [PATCH] v0.20.8: fix npmPrefixPath --- package.json | 2 +- usr/share/install-launcher.js | 4 ++-- usr/share/template-launcher.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 38cf164..5457a41 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "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.", "main": "lib/remote.js", "files": [ diff --git a/usr/share/install-launcher.js b/usr/share/install-launcher.js index eec6c56..8e04fad 100644 --- a/usr/share/install-launcher.js +++ b/usr/share/install-launcher.js @@ -114,8 +114,8 @@ Launcher.install = function (things, fn) { }; vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl'); vars.telebitNpm = path.resolve(vars.telebitNode, '../npm'); - vars.nodePath = path.resolve(vars.telebitNode, '../lib/node_modules'); - vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..'); + vars.nodePath = path.resolve(vars.telebitNode, '../../lib/node_modules'); + vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..', '..'); vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false; if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) { vars.telebitRwDirs.push(vars.npmConfigPrefix); diff --git a/usr/share/template-launcher.js b/usr/share/template-launcher.js index 124766f..9c0f259 100644 --- a/usr/share/template-launcher.js +++ b/usr/share/template-launcher.js @@ -79,8 +79,8 @@ function run() { , 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.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../lib/node_modules'); - vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..'); + vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../../lib/node_modules'); + vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..', '..'); if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) { vars.telebitRwDirs.push(vars.npmConfigPrefix); }