From 79f7ace89ab706c128745a23468f7c580540db72 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Thu, 5 Aug 2021 14:31:39 +0530
Subject: revert: partially reverts the previous change to fix issue that the
 packaged app doesn't start up

---
 src/index.js                         | 2 +-
 src/internal-server/start.js         | 2 --
 src/internal-server/start/migrate.js | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/index.js b/src/index.js
index 7c52fa1b3..78ab9bef2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,7 +28,7 @@ import DBus from './lib/DBus';
 import Settings from './electron/Settings';
 import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
-import { appId } from '../package.json';
+import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
 import { asarPath } from './helpers/asar-helpers';
diff --git a/src/internal-server/start.js b/src/internal-server/start.js
index 683f24651..dbf7ea9c9 100644
--- a/src/internal-server/start.js
+++ b/src/internal-server/start.js
@@ -20,9 +20,7 @@ const { Ignitor } = require('@adonisjs/ignitor');
 const fs = require('fs-extra');
 const os = require('os');
 const path = require('path');
-const packageJSON = require('../../package.json');
 
-process.env.FERDI_VERSION = packageJSON.version;
 process.env.ENV_PATH = path.join(__dirname, 'env.ini');
 
 module.exports = async (userPath, port) => {
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index 6846beef6..c27e07bc5 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -1,3 +1,5 @@
+const { ferdiVersion } = require('../../environment');
+
 /**
  * Migrate server database to work with current Ferdi version
  */
@@ -25,16 +27,16 @@ module.exports = async () => {
     settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
   }
 
-  if (!settings || !settings.db_version || settings.db_version !== process.env.FERDI_VERSION) {
+  if (!settings || !settings.db_version || settings.db_version !== ferdiVersion) {
     const srcVersion = settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
-    migrateLog(`🔮  Migrating table from ${srcVersion} to ${process.env.FERDI_VERSION}`);
+    migrateLog(`🔮  Migrating table from ${srcVersion} to ${ferdiVersion}`);
 
     // Migrate database to current Ferdi version
     // Currently no migrations
 
     // Update version number in database
     if (!settings) settings = {};
-    settings.db_version = process.env.FERDI_VERSION;
+    settings.db_version = ferdiVersion;
     const newUser = await User.find(1); // Fetch user again as we might have only just created it
     newUser.settings = JSON.stringify(settings);
     await newUser.save();
-- 
cgit v1.2.3-70-g09d2