From a9e8baa27fb3ab9dae28a7b36ce581eb7a652d84 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sat, 15 Sep 2018 13:52:21 -0400 Subject: [PATCH] references 'granax' to comply with licensing requirements --- CHANGELOG.md | 5 +++++ package.json | 2 +- src/default_config.js | 23 +---------------------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a096b3d..df3ec97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [4.0.3] - 2018-09-15 + +### Changed +- References granax in `default_config.js` to comply with licensing requirements. + ## [4.0.2] - 2018-09-15 ### Added diff --git a/package.json b/package.json index 682a798..80ea7ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tor-router", - "version": "4.0.2", + "version": "4.0.3", "main": "src/index.js", "repository": "git@github.com:znetstar/tor-router.git", "author": "Zachary Boyd ", diff --git a/src/default_config.js b/src/default_config.js index 38828c1..56bd2b5 100644 --- a/src/default_config.js +++ b/src/default_config.js @@ -21,28 +21,7 @@ module.exports = { "Log": "notice stdout", "NewCircuitPeriod": "10" }, - "torPath": (() => { - let platform = require('os').platform(); - let BIN_PATH = path.join(__dirname, '..', 'node_modules', 'granax', 'bin'); - /** - * @author gordonhall on GitLab - */ - switch (platform) { - case 'win32': - return path.join(BIN_PATH, 'Browser', 'TorBrowser', 'Tor', 'tor.exe'); - break; - case 'darwin': - return path.join(BIN_PATH, '.tbb.app', 'Contents', 'Resources', - 'TorBrowser', 'Tor', 'tor'); - break; - case 'android': - case 'linux': - return path.join(BIN_PATH, 'tor-browser_en-US', 'Browser', 'TorBrowser', 'Tor', 'tor'); - break; - default: - return "tor"; - } - })(), + "torPath": require('granax').tor(require('os').platform()), "instances": null, "dns": { "timeout": 10000,