adding icon (#1571)

* adding icon as a workaround

* point to an actual icon

* include zap icon in the zip

* fix path

* PR review and verify zap.png

Author: paulr34

.github/workflows/release.yml

@@ -333,6 +333,76 @@ jobs:
       - name: ZAP binary check (Linux) - unzip cleanup
         if: startsWith(matrix.os, 'ubuntu')
         run: rm -rf dist/zap-linux
+      - name: Verify zap.png exists in package's base directory
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: ./node_modules/7zip-bin/linux/x64/7za l ./dist/zap-linux-x64.zip | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in package's app.asar archive
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: npx asar l ./dist/linux-unpacked/resources/app.asar | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in Windows x64 .zip package
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: 7za l ./dist/zap-win-x64.zip | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in Windows x64 .zip package's app.asar archive
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: npx asar l ./dist/win-unpacked/resources/app.asar | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in Windows arm64 .zip package
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: 7za l ./dist/zap-win-arm64.zip | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in Windows arm64 .zip package's app.asar archive
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: npx asar l ./dist/win-arm64-unpacked/resources/app.asar | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in macOS x64 .zip package
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: 7za l ./dist/zap-mac-x64.zip | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in macOS x64 .zip package's app-x64.asar archive
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: npx asar l ./dist/mac/zap.app/Contents/Resources/app-x64.asar | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in macOS arm64 .zip package
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: 7za l ./dist/zap-mac-arm64.zip | grep zap.png
+          contains: 'zap.png'
+
+      - name: Verify zap.png exists in macOS arm64 .zip package's app-arm64.asar archive
+        if: startsWith(matrix.os, 'macos')
+        uses: GuillaumeFalourd/assert-command-line-output@v2.1
+        with:
+          command_line: npx asar l ./dist/mac-arm64/zap.app/Contents/Resources/app-arm64.asar | grep zap.png
+          contains: 'zap.png'
+
       - name: Verify apack.json exists in package's base directory
         if: startsWith(matrix.os, 'ubuntu')
         uses: GuillaumeFalourd/assert-command-line-output@v2.1

apack.json

@@ -55,6 +55,7 @@
       "id": "ZAP",
       "category": "tools",
       "label": "ZCL Advanced Platform",
+      "icon": "zap.png",
       "launchUiFunction": "launchZAP",
       "toolTip": "ZCL Advanced Platform"
     }

src-script/pack-apack-mac.js

@@ -5,31 +5,48 @@ const sevenBin = require('7zip-bin')
 const pathTo7zip = sevenBin.path7za
 
 exports.default = async function (buildResult) {
-  buildResult?.artifactPaths?.forEach((element) => {
+  for (const element of buildResult?.artifactPaths || []) {
     if (
       (element.includes('mac') ||
         element.includes('win') ||
         element.includes('linux')) &&
       element.endsWith('.zip')
     ) {
-      const myStream = Seven.add(
-        element,
-        path.join(buildResult.outDir, '../apack.json'),
-        {
-          $progress: true,
-          $bin: pathTo7zip
-        }
-      )
-      // myStream.on('end', function () {
-      //   console.log(myStream.info)
-      // })
+      // Add apack.json first
+      await new Promise((resolve, reject) => {
+        const myStream1 = Seven.add(
+          element, // The .zip file (output)
+          path.join(buildResult.outDir, '../apack.json'), // Add apack.json
+          {
+            $progress: true,
+            $bin: pathTo7zip
+          }
+        )
 
-      myStream.on('error', function (err) {
-        if (err) {
-          console.log(err.stderr)
-          throw err
-        }
+        myStream1.on('end', resolve)
+        myStream1.on('error', (err) => {
+          console.log('Error adding apack.json:', err.stderr)
+          reject(err)
+        })
+      })
+
+      // Then add zap.png after apack.json is added
+      await new Promise((resolve, reject) => {
+        const myStream2 = Seven.add(
+          element, // The .zip file (output)
+          path.join(buildResult.outDir, '../src/assets/zap.png'), // Add zap.png
+          {
+            $progress: true,
+            $bin: pathTo7zip
+          }
+        )
+
+        myStream2.on('end', resolve)
+        myStream2.on('error', (err) => {
+          console.log('Error adding zap.png:', err.stderr)
+          reject(err)
+        })
       })
     }
-  })
+  }
 }

src-script/pack-apack-win-linux.js

@@ -6,12 +6,14 @@ exports.default = async function (context) {
     context.electronPlatformName === 'win32' ||
     context.electronPlatformName === 'linux'
   ) {
-    return scriptUtil.executeCmd({}, 'npx', [
+    await scriptUtil.executeCmd({}, 'npx', [
       'copyfiles',
       '-V',
       '-f',
       path.resolve(context.outDir, '../apack.json'),
+      path.resolve(context.outDir, '../src/assets/zap.png'),
       context.appOutDir
     ])
+    console.log('Files copied successfully.')
   }
 }