diff options
author | 2021-09-13 13:36:29 +0530 | |
---|---|---|
committer | 2021-09-13 13:36:29 +0530 | |
commit | 9bbf76b134d0fef9ebeb04169842ab7eb2575ef7 (patch) | |
tree | 8c11bbf0abb67b828b92f6ee37a593a297d17627 /src/environment.js | |
parent | docs: Bumped up version for '5.6.1' (diff) | |
parent | docs: updated Changelog [skip ci] (diff) | |
download | ferdium-app-9bbf76b134d0fef9ebeb04169842ab7eb2575ef7.tar.gz ferdium-app-9bbf76b134d0fef9ebeb04169842ab7eb2575ef7.tar.zst ferdium-app-9bbf76b134d0fef9ebeb04169842ab7eb2575ef7.zip |
Merge branch 'nightly' into release
Diffstat (limited to 'src/environment.js')
-rw-r--r-- | src/environment.js | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/environment.js b/src/environment.js index caeada94b..9d7ffaf78 100644 --- a/src/environment.js +++ b/src/environment.js | |||
@@ -5,7 +5,6 @@ import { is, api as electronApi } from 'electron-util'; | |||
5 | 5 | ||
6 | import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme'; | 6 | import { DEFAULT_ACCENT_COLOR } from '@meetfranz/theme'; |
7 | 7 | ||
8 | import osName from 'os-name'; | ||
9 | import { | 8 | import { |
10 | LIVE_FERDI_API, | 9 | LIVE_FERDI_API, |
11 | DEV_FRANZ_API, | 10 | DEV_FRANZ_API, |
@@ -24,7 +23,6 @@ import { | |||
24 | } from './config'; | 23 | } from './config'; |
25 | 24 | ||
26 | import { asarPath } from './helpers/asar-helpers'; | 25 | import { asarPath } from './helpers/asar-helpers'; |
27 | import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved | ||
28 | 26 | ||
29 | export const { app } = electronApi; | 27 | export const { app } = electronApi; |
30 | export const ferdiVersion = app.getVersion(); | 28 | export const ferdiVersion = app.getVersion(); |
@@ -171,18 +169,5 @@ export const DEFAULT_APP_SETTINGS = { | |||
171 | searchEngine: SEARCH_ENGINE_DDG, | 169 | searchEngine: SEARCH_ENGINE_DDG, |
172 | useVerticalStyle: false, | 170 | useVerticalStyle: false, |
173 | alwaysShowWorkspaces: false, | 171 | alwaysShowWorkspaces: false, |
172 | liftSingleInstanceLock: false, | ||
174 | }; | 173 | }; |
175 | |||
176 | export function aboutAppDetails() { | ||
177 | return [ | ||
178 | `Version: ${ferdiVersion}`, | ||
179 | `Electron: ${electronVersion}`, | ||
180 | `Chrome: ${chromeVersion}`, | ||
181 | `Node.js: ${nodeVersion}`, | ||
182 | `Platform: ${osName()}`, | ||
183 | `Arch: ${process.arch}`, | ||
184 | `Build date: ${new Date(Number(buildInfo.timestamp))}`, | ||
185 | `Git SHA: ${buildInfo.gitHashShort}`, | ||
186 | `Git branch: ${buildInfo.gitBranch}`, | ||
187 | ].join('\n'); | ||
188 | } | ||