From 1caa08bba697cbc4cff5e74e5dcb8904482ecb76 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Sat, 2 Apr 2022 15:36:08 +0100 Subject: [PATCH] Update Build-Electron.ps1 Former-commit-id: 1a06bfefb0d4d56f168e3997f9c82d58850ba162 [formerly eb420efddbbb843a118dc42b5df7c1fb80a49154] [formerly 9c5f07d8522a06747c7425d0952c4b4c1b305f1c] [formerly 94e53d0fc0b5e7cb2d6c7f7a4253ee9de86996a7 [formerly a78da39558eb3932815d22ae58e703415b8da18a [formerly bf56526206dc9aa79f6a8915200d72379d2dad72]]] Former-commit-id: 7545a5eedf3ca5a8d45b80702cf04796f3a33440 [formerly 91d3c75ccdb9676c6839dfd1ab018e3678c4b31b [formerly f2518f09ad84d7acc6ebaf849acb83400bc370a9]] Former-commit-id: e9fee06513bee7f074c5e2ad0750cc1baa444438 [formerly 2bc7132d75f03aed521ac2556af3b352ae149d4f] Former-commit-id: 67192ffeb5f661f2e935f02ab8df74411263686c --- scripts/Build-Electron.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Build-Electron.ps1 b/scripts/Build-Electron.ps1 index c6e58aea..a7961417 100644 --- a/scripts/Build-Electron.ps1 +++ b/scripts/Build-Electron.ps1 @@ -54,7 +54,7 @@ if ($alt_tag -imatch 'WikiMed|Wikivoyage') { $WinInstaller = $base_dir + "$alt_tag.by.Kiwix.Setup.$numeric_tag-E.exe" } if ($electronbuild -eq "local") { - if (-Not (Test-Path $WinInstaller -PathType Leaf) -and (-not $portableonly)) { + if (-Not (Test-Path $WinInstaller -PathType Leaf)) { "No package found: building $WinInstaller..." if (-Not $dryrun) { npm run dist-win @@ -65,11 +65,11 @@ if ($electronbuild -eq "local") { } } } else { - "Package found or only building portable package." + "Package found." } } -# Portable app isn't built in the cloud, so we always run this -if (-Not ($old_windows_support -or (Test-Path $comp_electron_archive -PathType Leaf))) { +# Build portable app if not in cloud +if (-Not (($electronbuild -eq 'cloud') -or $old_windows_support -or (Test-Path $comp_electron_archive -PathType Leaf))) { # Package portable electron app for Windows "Building portable Electron app for Windows" # Line below uses electron-packager, but not necessary if we run the setup version first above