From 02082c385c755489aef3bf4c6d34e5544a4b7a63 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 21 Nov 2017 21:59:54 +0100 Subject: [PATCH 1/2] include wincredmgr for Windows --- app/package.json | 5 ++++- app/yarn.lock | 8 ++++++++ package.json | 13 ++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/package.json b/app/package.json index 7f54ae29..af7aa261 100644 --- a/app/package.json +++ b/app/package.json @@ -29,9 +29,12 @@ "mz": "^2.6.0", "path": "0.12.7", "rxjs": "5.3.0", - "xkeychain": "0.0.6", "zone.js": "0.8.12" }, + "optionalDependencies": { + "wincredmgr": "^2.0.0", + "xkeychain": "^0.0.6" + }, "devDependencies": { "@types/mz": "0.0.31" } diff --git a/app/yarn.lock b/app/yarn.lock index 1359b553..14cfbca1 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -268,6 +268,14 @@ util@^0.10.3: dependencies: inherits "2.0.1" +wincredmgr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wincredmgr/-/wincredmgr-2.0.0.tgz#cab8e3c6d98f0ea255d7638e82fd9f393ca7f515" + +xkeychain@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/xkeychain/-/xkeychain-0.0.6.tgz#1c58b3dd2f80481f8f67949c3511aa14027c2b9b" + zone.js@0.8.12: version "0.8.12" resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.12.tgz#86ff5053c98aec291a0bf4bbac501d694a05cfbb" diff --git a/package.json b/package.json index 3f799441..7f99fd45 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "electron-rebuild": "1.5.11", "file-loader": "0.9.0", "font-awesome": "4.7.0", + "graceful-fs": "^4.1.11", "html-loader": "0.4.4", "json-loader": "0.5.4", "less": "2.7.1", @@ -53,7 +54,9 @@ ], "win": { "icon": "./build/windows/icon.ico", - "publish": ["github"] + "publish": [ + "github" + ] }, "squirrelWindows": { "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico", @@ -63,7 +66,9 @@ "category": "public.app-category.video", "icon": "./build/mac/icon.icns", "identity": null, - "publish": ["github"] + "publish": [ + "github" + ] }, "dmg": { "artifactName": "terminus-${version}-${os}-${arch}.dmg" @@ -71,7 +76,9 @@ "linux": { "category": "Utilities", "icon": "./build/icons", - "publish": ["github"] + "publish": [ + "github" + ] }, "deb": { "depends": [ From 92993db1226969b978062700f1240f230a93032b Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 21 Nov 2017 22:16:59 +0100 Subject: [PATCH 2/2] fixed #234 --- terminus-terminal/src/shells/windowsStock.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/terminus-terminal/src/shells/windowsStock.ts b/terminus-terminal/src/shells/windowsStock.ts index dd57339d..cb81d60b 100644 --- a/terminus-terminal/src/shells/windowsStock.ts +++ b/terminus-terminal/src/shells/windowsStock.ts @@ -34,7 +34,14 @@ export class WindowsStockShellsProvider extends ShellProvider { ] }, { id: 'cmd', name: 'CMD (stock)', command: 'cmd.exe' }, - { id: 'powershell', name: 'PowerShell', command: 'powershell.exe' }, + { + id: 'powershell', + name: 'PowerShell', + command: 'powershell.exe', + env: { + TERM: 'cygwin', + } + }, ] } }