jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 11:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): Don't use electron to get USER_DATA_DIR in CLI

Browse Source 
A previous change erronously relied solely on `electron` to determine
the user's data directory, which of course, isn't available when
running in the CLI. So this adds a fallback to the same mechanic
for CLI should this code not be loaded in Electron.

Change-type: patch
Signed-off-by: Jonas Hermsmeier <jhermsmeier@gmail.com>
This commit is contained in:
Jonas Hermsmeier 2018-08-02 18:12:28 +02:00 committed by Lorenzo Alberto Maria Ambrosi
parent d0ee569989
commit 40d84b7a82
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,10 @@
'use strict'
const electron = require('electron')
const Bluebird = require('bluebird')
const fs = require('fs')
const path = require('path')
const os = require('os')
/**
* @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
* - `~/Library/Application Support/etcher` on macOS
* 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
* @type {String}
*/
const USER_DATA_DIR = electron.app
const USER_DATA_DIR = (() => {
// Electron
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