Skip to content

Commit 20afa9c

Browse files
committed
Move overrides into a seperate top-level folder
1 parent f9a7ada commit 20afa9c

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed
File renamed without changes.
File renamed without changes.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
"files": [
1111
"oclif.manifest.json",
1212
"/bin",
13-
"/lib"
13+
"/lib",
14+
"/overrides"
1415
],
1516
"scripts": {
1617
"start": "node-dev ./bin/run start",
1718
"build": "npm run build:src && npm run build:release",
18-
"build:src": "rm -rf lib && tsc -b && cp -r src/interceptors/terminal-wrappers lib/interceptors",
19+
"build:src": "rm -rf lib && tsc -b",
1920
"build:release": "oclif-dev manifest && ./build-release.sh linux && ./build-release.sh darwin && ./build-release.sh win32",
2021
"prepack": "npm run build:src && oclif-dev manifest",
2122
"test": "TS_NODE_FILES=true mocha -r ts-node/register 'test/**/*.spec.ts'"

src/interceptors/fresh-terminal.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ const DEFAULT_GIT_BASH_PATH = 'C:/Program Files/git/git-bash.exe';
2323
const PATH_VAR_SEPARATOR = process.platform === 'win32' ? ';' : ':';
2424
const SHELL = (process.env.SHELL || '').split('/').slice(-1)[0];
2525

26-
const OVERRIDE_BIN_PATH = path.join(__dirname, 'terminal-wrappers');
26+
const OVERRIDES_DIR = path.join(__dirname, '..', '..', 'overrides');
27+
28+
const OVERRIDE_BIN_PATH = path.join(OVERRIDES_DIR, 'path');
2729
// Generate POSIX paths for git-bash on Windows (or use the normal path everywhere where)
2830
const POSIX_OVERRIDE_BIN_PATH = process.platform === 'win32'
2931
? OVERRIDE_BIN_PATH.replace(/\\/g, '/').replace(/^(\w+):/, (_all, driveLetter) => `/${driveLetter.toLowerCase()}`)

0 commit comments

Comments
 (0)