quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-14 12:58:39 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding logic to support working directory config (#3769)

Browse source 
* #3000: Adding logic to support working directory config

* #3000: Removing unused import

* #3000: Removing extra space
This commit is contained in:
Kaushik 2019-10-04 21:27:58 +01:00 committed by Benjamin Staneck
parent 76eff24484
commit 19644f3fa2
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/config/config-default.js
View file

@ -57,6 +57,9 @@ module.exports = {
// custom CSS to embed in the terminal window // custom CSS to embed in the terminal window
termCSS: '', termCSS: '',
// set custom startup directory (must be an absolute path)
workingDirectory: '',
// if you're using a Linux setup which show native menus, set to false // if you're using a Linux setup which show native menus, set to false
// default: `true` on Linux, `true` on Windows, ignored on macOS // default: `true` on Linux, `true` on Windows, ignored on macOS
showHamburgerMenu: '', showHamburgerMenu: '',

12
app/ui/window.js
View file

@ -6,7 +6,7 @@ const fileUriToPath = require('file-uri-to-path');
const isDev = require('electron-is-dev'); const isDev = require('electron-is-dev');
const updater = require('../updater'); const updater = require('../updater');
const toElectronBackgroundColor = require('../utils/to-electron-background-color'); const toElectronBackgroundColor = require('../utils/to-electron-background-color');
const {icon, homeDirectory} = require('../config/paths'); const {icon, cfgDir} = require('../config/paths');
const createRPC = require('../rpc'); const createRPC = require('../rpc');
const notify = require('../notify'); const notify = require('../notify');
const fetchNotifications = require('../notifications'); const fetchNotifications = require('../notifications');
@ -55,6 +55,14 @@ module.exports = class Window {
window.setBackgroundColor(toElectronBackgroundColor(cfg_.backgroundColor || '#000')); window.setBackgroundColor(toElectronBackgroundColor(cfg_.backgroundColor || '#000'));
}; };
// set working directory
let workingDirectory = cfgDir;
if (process.argv[1] && isAbsolute(process.argv[1])) {
workingDirectory = process.argv[1];
} else if (cfg.workingDirectory && isAbsolute(cfg.workingDirectory)) {
workingDirectory = cfg.workingDirectory;
}
// config changes // config changes
const cfgUnsubscribe = app.config.subscribe(() => { const cfgUnsubscribe = app.config.subscribe(() => {
const cfg_ = app.plugins.getDecoratedConfig(); const cfg_ = app.plugins.getDecoratedConfig();
@ -106,7 +114,7 @@ module.exports = class Window {
{ {
rows: 40, rows: 40,
cols: 100, cols: 100,
cwd: process.argv[1] && isAbsolute(process.argv[1]) ? process.argv[1] : homeDirectory, cwd: workingDirectory,
splitDirection: undefined, splitDirection: undefined,
shell: cfg.shell, shell: cfg.shell,
shellArgs: cfg.shellArgs && Array.from(cfg.shellArgs) shellArgs: cfg.shellArgs && Array.from(cfg.shellArgs)