From 31e172c8bfe5782d8919b76220033b4141460f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Sat, 3 Mar 2018 17:46:53 +0300 Subject: [PATCH 1/3] Should fix #2 * Started using INIT_CWD env variable to get to the base folder. * CLRF --> LF --- DontRunMe.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DontRunMe.js b/DontRunMe.js index 89f3b9e..39a33ea 100644 --- a/DontRunMe.js +++ b/DontRunMe.js @@ -3,7 +3,7 @@ const detectNewline = require("detect-newline"); const crypto = require("crypto"); // define crypto const fs = require("fs"); // define filesys -let projectRoot = require("path").dirname(require.main.filename); +let projectRoot = process.env.INIT_CWD; let fetchedKey, fetchedHMAC, convertedConfig = false; const exit = (msg) => { diff --git a/package-lock.json b/package-lock.json index 6692f90..26253dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "basic256.js", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0ea7f1d..327f7b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "basic256.js", - "version": "1.2.0", + "version": "1.2.1", "description": "A basic encryption/decryption script/API for resting data for Node.js users.", "engines": { "node": ">=8.4.0" From 3bc79005ecb1afc446316aa5eb4eb162040fa6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Sat, 3 Mar 2018 18:07:49 +0300 Subject: [PATCH 2/3] Fixes #2 and any future linking issues --- DontRunMe.js | 2 +- basic256.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DontRunMe.js b/DontRunMe.js index 39a33ea..ef95ea7 100644 --- a/DontRunMe.js +++ b/DontRunMe.js @@ -3,7 +3,7 @@ const detectNewline = require("detect-newline"); const crypto = require("crypto"); // define crypto const fs = require("fs"); // define filesys -let projectRoot = process.env.INIT_CWD; +let projectRoot = require("path").dirname(require.main.children[0].filename).replace(/[\/\\]node_modules[\/\\].*/g, ""); // eslint-disable-line no-useless-escape let fetchedKey, fetchedHMAC, convertedConfig = false; const exit = (msg) => { diff --git a/basic256.js b/basic256.js index af52860..0a0f47b 100644 --- a/basic256.js +++ b/basic256.js @@ -1,7 +1,7 @@ "use strict"; let crypto = require("crypto"); -let projectRoot = require("path").dirname(require.main.filename); +let projectRoot = require("path").dirname(require.main.children[0].filename).replace(/[\/\\]node_modules[\/\\].*/g, ""); // eslint-disable-line no-useless-escape /** * A basic encryption/decryption script/API for resting data for Node.js users. From f4889b0b4ad2bf8920f44623256342f14fb19be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= Date: Sun, 4 Mar 2018 19:58:56 +0300 Subject: [PATCH 3/3] This should fix the issue where execution path is different than root. --- DontRunMe.js | 2 +- basic256.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DontRunMe.js b/DontRunMe.js index ef95ea7..40850dd 100644 --- a/DontRunMe.js +++ b/DontRunMe.js @@ -3,7 +3,7 @@ const detectNewline = require("detect-newline"); const crypto = require("crypto"); // define crypto const fs = require("fs"); // define filesys -let projectRoot = require("path").dirname(require.main.children[0].filename).replace(/[\/\\]node_modules[\/\\].*/g, ""); // eslint-disable-line no-useless-escape +let projectRoot = require("path").dirname(require.main.filename).replace(/[\/\\]node_modules[\/\\].*/g, ""); // eslint-disable-line no-useless-escape let fetchedKey, fetchedHMAC, convertedConfig = false; const exit = (msg) => { diff --git a/basic256.js b/basic256.js index 0a0f47b..b27b4f0 100644 --- a/basic256.js +++ b/basic256.js @@ -1,7 +1,7 @@ "use strict"; let crypto = require("crypto"); -let projectRoot = require("path").dirname(require.main.children[0].filename).replace(/[\/\\]node_modules[\/\\].*/g, ""); // eslint-disable-line no-useless-escape +let projectRoot = require("path").dirname(require.main.filename).replace(/[\/\\]node_modules[\/\\].*/g, ""); // eslint-disable-line no-useless-escape /** * A basic encryption/decryption script/API for resting data for Node.js users. diff --git a/package.json b/package.json index 327f7b5..865a697 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "basic256.js", - "version": "1.2.1", + "version": "1.2.3", "description": "A basic encryption/decryption script/API for resting data for Node.js users.", "engines": { "node": ">=8.4.0"