From d95ae373abfa0eda1d4d412bd23ce2f9d47a59c4 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <gsusmi@gmail.com>
Date: Tue, 1 Jun 2021 11:28:47 -0400
Subject: [PATCH] refactor: Move windows app icon to new assets folder

---
 .../{config => assets}/app-icons/icon.ico           | Bin
 ui/desktop/electron-app/config/desktop.js           |   6 +++---
 ui/desktop/electron-app/config/forge.config.js      |   3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename ui/desktop/electron-app/{config => assets}/app-icons/icon.ico (100%)

diff --git a/ui/desktop/electron-app/config/app-icons/icon.ico b/ui/desktop/electron-app/assets/app-icons/icon.ico
similarity index 100%
rename from ui/desktop/electron-app/config/app-icons/icon.ico
rename to ui/desktop/electron-app/assets/app-icons/icon.ico
diff --git a/ui/desktop/electron-app/config/desktop.js b/ui/desktop/electron-app/config/desktop.js
index 95c15ff3b..af9c8f5de 100644
--- a/ui/desktop/electron-app/config/desktop.js
+++ b/ui/desktop/electron-app/config/desktop.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-// Create config for use in electron forge
+// Create config
 const createConfig = () => {
   const config = {
     name: 'boundary',
@@ -15,9 +15,9 @@ const createConfig = () => {
   return config;
 };
 
-// Save config file
+// Save config to file
 const saveConfig = (config, destination) => {
-  const configPath = `${destination}/config.js`;
+  const configPath = path.join(destination, 'config.js');
   const content = `module.exports = ${JSON.stringify(config, null, 2)}`;
   fs.writeFileSync(configPath, content);
   console.log(`Create: ${configPath}`);
diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index 2add32d75..63755fde4 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -1,11 +1,12 @@
 // Generated during build
 const config = require('./config.js');
+const { isMac } = require('../src/helpers/platform.js');
 
 console.log(`\n[forge-config] Release commit: ${config.releaseCommit}`);
 console.log(`[forge-config] Release version: ${config.releaseVersion}`);
 
 // MacOS signing identity
-if (process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY)
+if (isMac() && !process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY)
   console.warn(
     '[forge-config] WARNING: Could not find signing identity. Proceeding without signing.'
   );