app-builder-lib 26.0.18 → 26.0.19

package/scheme.json

@@ -7,6 +7,9 @@
         {
           "$ref": "#/definitions/GithubOptions"
         },
+        {
+          "$ref": "#/definitions/GitlabOptions"
+        },
         {
           "$ref": "#/definitions/S3Options"
         },
@@ -108,6 +111,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -256,6 +262,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -732,6 +741,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -911,6 +923,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -1270,6 +1285,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -1592,6 +1610,88 @@
       ],
       "type": "object"
     },
+    "GitlabOptions": {
+      "additionalProperties": false,
+      "description": "[GitLab](https://docs.gitlab.com/ee/user/project/releases/) options.\n\nGitLab [personal access token](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html) is required for private repositories. You can generate one by going to your GitLab profile settings.\nDefine `GITLAB_TOKEN` environment variable.",
+      "properties": {
+        "channel": {
+          "default": "latest",
+          "description": "The channel.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "host": {
+          "default": "gitlab.com",
+          "description": "The host (including the port if needed).",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "projectId": {
+          "description": "The GitLab project ID or namespace/project-name.",
+          "type": [
+            "string",
+            "number"
+          ]
+        },
+        "provider": {
+          "const": "gitlab",
+          "description": "The provider. Must be `gitlab`.",
+          "type": "string"
+        },
+        "publishAutoUpdate": {
+          "default": true,
+          "description": "Whether to publish auto update info files.\n\nAuto update relies only on the first provider in the list (you can specify several publishers).\nThus, probably, there`s no need to upload the metadata files for the other configured providers. But by default will be uploaded.",
+          "type": "boolean"
+        },
+        "publisherName": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "requestHeaders": {
+          "$ref": "#/definitions/OutgoingHttpHeaders",
+          "description": "Any custom request headers"
+        },
+        "timeout": {
+          "default": 120000,
+          "description": "Request timeout in milliseconds. (Default is 2 minutes; O is ignored)",
+          "type": [
+            "null",
+            "number"
+          ]
+        },
+        "token": {
+          "description": "The access token to support auto-update from private GitLab repositories. Never specify it in the configuration files. Only for [setFeedURL](./auto-update.md#appupdatersetfeedurloptions).",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "updaterCacheDirName": {
+          "type": [
+            "null",
+            "string"
+          ]
+        }
+      },
+      "required": [
+        "projectId",
+        "provider"
+      ],
+      "type": "object"
+    },
     "KeygenOptions": {
       "additionalProperties": false,
       "description": "Keygen options.\nhttps://keygen.sh/\nDefine `KEYGEN_TOKEN` environment variable.",
@@ -2001,6 +2101,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -2273,6 +2376,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -2778,6 +2884,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -3410,6 +3519,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -3692,6 +3804,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -3818,6 +3933,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -4095,6 +4213,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -4443,6 +4564,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -5194,6 +5318,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -5310,6 +5437,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -5867,6 +5997,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -6177,6 +6310,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -6588,6 +6724,9 @@
             {
               "$ref": "#/definitions/GithubOptions"
             },
+            {
+              "$ref": "#/definitions/GitlabOptions"
+            },
             {
               "$ref": "#/definitions/S3Options"
             },
@@ -7624,6 +7763,9 @@
         {
           "$ref": "#/definitions/GithubOptions"
         },
+        {
+          "$ref": "#/definitions/GitlabOptions"
+        },
         {
           "$ref": "#/definitions/S3Options"
         },

package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh

@@ -30,22 +30,77 @@
 !macroend
 
 !macro CHECK_APP_RUNNING
-    !ifmacrodef customCheckAppRunning
-      !insertmacro customCheckAppRunning
+  Var /GLOBAL CmdPath
+  Var /GLOBAL FindPath
+  Var /GLOBAL PowerShellPath
+  !ifmacrodef customCheckAppRunning
+    !insertmacro customCheckAppRunning
+  !else
+    StrCpy $CmdPath "$SYSDIR\cmd.exe"
+    StrCpy $FindPath "$SYSDIR\find.exe"
+    StrCpy $PowerShellPath "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe"
+    !insertmacro IS_POWERSHELL_AVAILABLE
+    !insertmacro _CHECK_APP_RUNNING
+  !endif
+!macroend
+
+!macro IS_POWERSHELL_AVAILABLE
+  Var /GLOBAL IsPowerShellAvailable ; 0 = available, 1 = not available
+  # Try running PowerShell with a simple command to check if it's available
+  nsExec::Exec `"$PowerShellPath" -C "if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"`
+  Pop $0  # Return code (0 = success, other = error)
+
+  ${if} $0 == 0
+    # PowerShell is available, check if it's not blocked by policies
+    nsExec::Exec `"$PowerShellPath" -C "if ((Get-ExecutionPolicy -Scope Process) -eq 'Restricted') { exit 1 } else { exit 0 }"`
+    Pop $0
+  ${endIf}
+
+  ${if} $0 != 0
+    StrCpy $0 1
+  ${endIf}
+
+  StrCpy $IsPowerShellAvailable $0
+!macroend
+
+!macro FIND_PROCESS _FILE _RETURN
+  ${if} $IsPowerShellAvailable == 0
+    nsExec::Exec `"$PowerShellPath" -C "if ((Get-CimInstance -ClassName Win32_Process | ? {$$_.Path -and $$_.Path.StartsWith('$INSTDIR', 'CurrentCultureIgnoreCase')}).Count -gt 0) { exit 0 } else { exit 1 }"`
+    Pop ${_RETURN}
+  ${else}
+    !ifdef INSTALL_MODE_PER_ALL_USERS
+      ${nsProcess::FindProcess} "${_FILE}" ${_RETURN}
     !else
-      !insertmacro _CHECK_APP_RUNNING
+      # find process owned by current user
+      nsExec::Exec `"$CmdPath" /C tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" /FO CSV | "$FindPath" "${_FILE}"`
+      Pop ${_RETURN}
     !endif
+  ${endIf}
 !macroend
 
-!macro FIND_PROCESS _FILE _ERR
-  !ifdef INSTALL_MODE_PER_ALL_USERS
-    ${nsProcess::FindProcess} "${_FILE}" ${_ERR}
-  !else
-    # find process owned by current user
-    nsExec::Exec `"$SYSDIR\cmd.exe" /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" /FO csv | "$SYSDIR\find.exe" "${_FILE}"`
-    Pop ${_ERR}
-  !endif
-!macroend
+!macro KILL_PROCESS _FILE _FORCE
+  Push $0
+  ${if} ${_FORCE} == 1
+    ${if} $IsPowerShellAvailable == 0
+      StrCpy $0 "-Force"
+    ${else}
+      StrCpy $0 "/F"
+    ${endIf}
+  ${else}
+    StrCpy $0 ""
+  ${endIf}
+
+  ${if} $IsPowerShellAvailable == 0
+    nsExec::Exec `"$PowerShellPath" -C "Get-CimInstance -ClassName Win32_Process | ? {$$_.Path -and $$_.Path.StartsWith('$INSTDIR', 'CurrentCultureIgnoreCase')} | % { Stop-Process -Id $$_.ProcessId $0 }"`
+  ${else}
+    !ifdef INSTALL_MODE_PER_ALL_USERS
+      nsExec::Exec `taskkill /IM "${_FILE}" /FI "PID ne $pid"`
+    !else
+      nsExec::Exec `"$CmdPath" /C taskkill $0 /IM "${_FILE}" /FI "PID ne $pid" /FI "USERNAME eq %USERNAME%"`
+    !endif
+  ${endIf}
+  Pop $0
+!macroend 
 
 !macro _CHECK_APP_RUNNING
   ${GetProcessInfo} 0 $pid $1 $2 $3 $4
@@ -69,12 +124,7 @@
 
       DetailPrint "$(appClosing)"
 
-      # https://github.com/electron-userland/electron-builder/issues/2516#issuecomment-372009092
-      !ifdef INSTALL_MODE_PER_ALL_USERS
-        nsExec::Exec `taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
-      !else
-        nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
-      !endif
+      !insertmacro KILL_PROCESS "${APP_EXECUTABLE_FILENAME}" 0
       # to ensure that files are not "in-use"
       Sleep 300
 
@@ -88,13 +138,9 @@
         ${if} $R0 == 0
           # wait to give a chance to exit gracefully
           Sleep 1000
-          !ifdef INSTALL_MODE_PER_ALL_USERS
-            nsExec::Exec `taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
-          !else
-            nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
-          !endif
+          !insertmacro KILL_PROCESS "${APP_EXECUTABLE_FILENAME}" 1 # 1 = force kill
           !insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0
-          ${If} $R0 == 0
+          ${if} $R0 == 0
             DetailPrint `Waiting for "${PRODUCT_NAME}" to close.`
             Sleep 2000
           ${else}

package/templates/nsis/multiUser.nsh

@@ -41,7 +41,7 @@ Var installMode
     ${endif}
 
     # allow /D switch to override installation path https://github.com/electron-userland/electron-builder/issues/1551
-    ${StdUtils.GetParameter} $R0 "D" ""
+    !insertmacro GetDParameter $R0
     ${If} $R0 != ""
       StrCpy $INSTDIR $R0
     ${endif}
@@ -84,10 +84,51 @@ Var installMode
     ${endif}
 
     # allow /D switch to override installation path https://github.com/electron-userland/electron-builder/issues/1551
-    ${StdUtils.GetParameter} $R0 "D" ""
+    !insertmacro GetDParameter $R0
     ${If} $R0 != ""
       StrCpy $INSTDIR $R0
     ${endif}
 
   !macroend
 !endif
+
+# Custom function to handle /D parameter with spaces
+# The /D parameter is special in NSIS - it must be the last parameter and cannot have quotes
+# Use StdUtils.GetParameter to get the full command line, then parse /D= manually
+!macro GetDParameter outVar
+  Push $R8
+  Push $R9
+  Push $R7
+  Push $R6
+  Push $R5
+
+  # Get the complete command line using StdUtils (including /D parameter)
+  ${StdUtils.GetAllParameters} $R8 "0"
+
+  # Initialize result
+  StrCpy $R9 ""
+
+  # Search for /D= or /d= using a simple loop
+  StrLen $R7 $R8
+  IntOp $R7 $R7 - 2  # Don't check last 2 characters
+  StrCpy $R6 0
+
+  ${Do}
+    StrCpy $R5 $R8 3 $R6  # Get 3 characters starting at position $R6
+    ${If} $R5 == "/D="
+    ${OrIf} $R5 == "/d="
+      # Found /D= or /d=, extract everything after it
+      IntOp $R6 $R6 + 3
+      StrCpy $R9 $R8 "" $R6
+      ${Break}
+    ${EndIf}
+    IntOp $R6 $R6 + 1
+  ${LoopUntil} $R6 > $R7
+
+  StrCpy ${outVar} $R9
+  Pop $R5
+  Pop $R6
+  Pop $R7
+  Pop $R9
+  Pop $R8
+!macroend