From 42dbff273f882a642e377d771f8744fc2ab4e3c6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 21:27:38 +0100
Subject: [PATCH] Refactor npm commands in workflows for consistency and
 improved clarity

---
 .github/workflows/build.yml                 | 4 ++--
 .github/workflows/windows-release-build.yml | 2 +-
 build/winsign/sign.ps1                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e17590993..7f3d5ba22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -219,8 +219,8 @@ jobs:
         run: |
           echo "$(pwd)"
           ls .
-          echo "version=$(npm run surfer get version | xargs)" >> $GITHUB_OUTPUT
-          if [[ $(npm run surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
+          echo "version=$(npm run surfer -- get version | xargs)" >> $GITHUB_OUTPUT
+          if [[ $(npm run surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
             echo ">>> Version matches"
           else
             echo ">>> Version mismatch"
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index a9e59ecbf..f1fa7c098 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -232,7 +232,7 @@ jobs:
           export ZEN_CROSS_COMPILING=1
           export ZEN_RELEASE=1
           npm run package
-          mv ./dist/zen-$(npm run surfer get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
+          mv ./dist/zen-$(npm run surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
           ls .
 
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 09600ff68..c5cba97c5 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -53,7 +53,7 @@ function SignAndPackage($name) {
     }
 
     echo "Compat Mode? $env:SURFER_COMPAT"
-    npm run surfer package --verbose
+    npm run package -- --verbose
 
     # In the release script, we do the following:
     #  tar -xvf .github/workflows/object/windows-x64-signed-x86_64.tar.gz -C windows-x64-signed-x86_64