Method reuse (#1379)

* Used already exported common functions to avoid the same logic being repeated.

* Use a different package to retrieve the os-name for the 'About Dialog'.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/index.js b/src/index.js
index a93040895..0fac386df 100644
--- a/src/index.js
+++ b/src/index.js
@@ -51,8 +51,9 @@ import {
 } from './config';
 import { asarPath } from './helpers/asar-helpers';
 import { isValidExternalURL } from './helpers/url-helpers';
-import userAgent from './helpers/userAgent-helpers';
+import userAgent, { ferdiVersion } from './helpers/userAgent-helpers';
 
+const osName = require('os-name');
 const debug = require('debug')('Ferdi:App');
 
 // From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the
@@ -162,7 +163,7 @@ if (!settings.get('enableGPUAcceleration')) {
 }
 
 app.setAboutPanelOptions({
-  applicationVersion: `Version: ${app.getVersion()}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${process.platform}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`,
+  applicationVersion: `Version: ${ferdiVersion}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${osName()}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`,
   version: '',
 });
 
@@ -394,7 +395,7 @@ app.on('ready', () => {
     app.setAsDefaultProtocolClient('ferdi-dev');
   }
 
-  if (process.platform === 'win32') {
+  if (isWindows) {
     app.setUserTasks([{
       program: process.execPath,
       arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,