From e5f17d9d2178e383cbeff4faa1406bed700f6d76 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Wed, 23 Oct 2019 11:20:11 +1100
Subject: [PATCH] Fix CI

---
 .gitlab-ci.yml        | 6 +++---
 package.json          | 2 +-
 prepare_beta_build.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69656b237..76d3a0c03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ linux:
     - yarn install --frozen-lockfile
     - export SIGNAL_ENV=production
     - yarn generate
-    - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
+    - $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
   cache:
     paths:
       - node_modules/
@@ -27,7 +27,7 @@ osx:
     - yarn install --frozen-lockfile
     - export SIGNAL_ENV=production
     - yarn generate
-    - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
+    - $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
   cache:
     paths:
       - node_modules/
@@ -51,7 +51,7 @@ windows:
     - call yarn generate
     - call node build\grunt.js
     - call yarn prepare-beta-build
-    - call node_modules\.bin\build --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
+    - call node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
     - call node build\grunt.js test-release:win
   cache:
     paths:
diff --git a/package.json b/package.json
index 3cec4b1b0..b045383cd 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "grunt": "grunt",
     "icon-gen": "electron-icon-maker --input=images/icon_1024.png --output=./build",
     "generate": "yarn icon-gen && yarn grunt",
-    "build": "build  --config.extraMetadata.environment=$SIGNAL_ENV",
+    "build": "electron-builder  --config.extraMetadata.environment=$SIGNAL_ENV",
     "build-release": "export SIGNAL_ENV=production && npm run build -- --config.directories.output=release",
     "sign-release": "node ts/updater/generateSignature.js",
     "build-module-protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js",
diff --git a/prepare_beta_build.js b/prepare_beta_build.js
index dfd41a3ac..1c6fcb881 100644
--- a/prepare_beta_build.js
+++ b/prepare_beta_build.js
@@ -31,8 +31,8 @@ const PRODUCTION_PRODUCT_NAME = 'Loki Messenger';
 const BETA_PRODUCT_NAME = 'Loki Messenger Beta';
 
 const APP_ID_PATH = 'build.appId';
-const PRODUCTION_APP_ID = 'org.loki.messenger-desktop';
-const BETA_APP_ID = 'org.loki.messenger-desktop-beta';
+const PRODUCTION_APP_ID = 'com.loki-project.messenger-desktop';
+const BETA_APP_ID = 'com.loki-project.messenger-desktop-beta';
 
 const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass';
 const PRODUCTION_STARTUP_WM_CLASS = 'Loki Messenger';