jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 23:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2433 from resin-io/fix-cli-settings

Browse Source 
fix(cli): Don't use electron to get USER_DATA_DIR in CLI
This commit is contained in:
Lorenzo Alberto Maria Ambrosi 2018-08-07 18:42:04 +02:00 committed by GitHub
commit 93906b9b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/gui/app/models/local-settings.js
View File

@ -16,10 +16,10 @@
'use strict' 'use strict'
const electron = require('electron')
const Bluebird = require('bluebird') const Bluebird = require('bluebird')
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const os = require('os')
/** /**
* @summary Number of spaces to indent JSON output with * @summary Number of spaces to indent JSON output with
@ -36,14 +36,31 @@ const JSON_INDENT = 2
* - `$XDG_CONFIG_HOME/etcher` or `~/.config/etcher` on Linux * - `$XDG_CONFIG_HOME/etcher` or `~/.config/etcher` on Linux
* - `~/Library/Application Support/etcher` on macOS * - `~/Library/Application Support/etcher` on macOS
* See https://electronjs.org/docs/api/app#appgetpathname * See https://electronjs.org/docs/api/app#appgetpathname
* NOTE: The ternary is due to this module being loaded both,
* in Electron's main and renderer processes
* @constant * @constant
* @type {String} * @type {String}
*/ */
const USER_DATA_DIR = electron.app const USER_DATA_DIR = (() => {
? electron.app.getPath('userData') // Electron
: electron.remote.app.getPath('userData') if (process.versions.electron) {
// NOTE: The ternary is due to this module being loaded both,
// Electron's main process and renderer process
const electron = require('electron')
return electron.app
? electron.app.getPath('userData')
: electron.remote.app.getPath('userData')
}
// CLI
if (process.platform === 'win32') {
return path.join(process.env.APPDATA, 'etcher')
}
if (process.platform === 'darwin') {
return path.join(os.homedir(), 'Library', 'Application Support', 'etcher')
}
return path.join(process.env.XDG_CONFIG_HOME || os.homedir(), '.config', 'etcher')
})()
/** /**
* @summary Configuration file path * @summary Configuration file path