feat(flatpak): use configuration for executableArgs (#9530)

Author: mmaietta

.changeset/rare-hounds-happen.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": minor
+---
+
+feat(flatpak): use configuration for `executableArgs`

packages/app-builder-lib/src/targets/FlatpakTarget.ts

@@ -8,6 +8,7 @@ import { FlatpakOptions } from "../options/linuxOptions"
 import { getNotLocalizedLicenseFile } from "../util/license"
 import { LinuxTargetHelper } from "./LinuxTargetHelper"
 import { createStageDir, StageDir } from "./targetUtil"
+import { Nullish } from "builder-util-runtime"
 
 export default class FlatpakTarget extends Target {
   readonly options: FlatpakOptions = {
@@ -66,7 +67,7 @@ export default class FlatpakTarget extends Target {
   private async createSandboxBinWrapper(stageDir: StageDir) {
     const useWaylandFlags = !!this.options.useWaylandFlags
     const electronWrapperPath = stageDir.getTempFile(path.join("bin", "electron-wrapper"))
-    await outputFile(electronWrapperPath, getElectronWrapperScript(this.packager.executableName, useWaylandFlags))
+    await outputFile(electronWrapperPath, getElectronWrapperScript(this.packager.executableName, this.options.executableArgs, useWaylandFlags))
     await chmod(electronWrapperPath, 0o755)
   }
 
@@ -157,23 +158,25 @@ const flatpakBuilderDefaults: Omit<FlatpakManifest, "id" | "command"> = {
   ],
 }
 
-function getElectronWrapperScript(executableName: string, useWaylandFlags: boolean): string {
-  return useWaylandFlags
-    ? `#!/bin/sh
+function getElectronWrapperScript(executableName: string, executableArgs: string[] | Nullish, useWaylandFlags: boolean): string {
+  const stringifiedExecutableArgs = executableArgs?.join(" ") || ""
+  if (useWaylandFlags) {
+    return `#!/bin/sh
 
 export TMPDIR="$XDG_RUNTIME_DIR/app/$FLATPAK_ID"
 
 if [ "\${XDG_SESSION_TYPE}" == "wayland" ]; then
-    zypak-wrapper "${executableName}" --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"
+    zypak-wrapper "${executableName}" ${stringifiedExecutableArgs} --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"
 else
-    zypak-wrapper "${executableName}" "$@"
+    zypak-wrapper "${executableName}" ${stringifiedExecutableArgs} "$@"
 fi
 `
-    : `#!/bin/sh
+  }
+  return `#!/bin/sh
 
 export TMPDIR="$XDG_RUNTIME_DIR/app/$FLATPAK_ID"
 
-zypak-wrapper "${executableName}" "$@"
+zypak-wrapper "${executableName}" ${stringifiedExecutableArgs} "$@"
 `
 }