Stage launcher under its public filename

Author: shunichironomura

scripts/prepare-launcher.mjs

@@ -99,15 +99,16 @@ if (profile === "release") {
 run("cargo", cargoArguments, { stdio: "inherit" });
 
 const metadata = JSON.parse(run("cargo", ["metadata", "--format-version", "1", "--no-deps"]));
-const executableName = `procnote-launcher${target.executableSuffix}`;
-const builtLauncher = join(metadata.target_directory, target.triple, profile, executableName);
+const cargoExecutableName = `procnote-launcher${target.executableSuffix}`;
+const builtLauncher = join(metadata.target_directory, target.triple, profile, cargoExecutableName);
 if (!existsSync(builtLauncher)) {
   throw new Error(`Cargo did not produce the launcher at ${builtLauncher}`);
 }
 
 rmSync(stagedDirectory, { recursive: true, force: true });
 mkdirSync(stagedDirectory, { recursive: true });
-const stagedLauncher = join(stagedDirectory, executableName);
+const stagedExecutableName = `procnote${target.executableSuffix}`;
+const stagedLauncher = join(stagedDirectory, stagedExecutableName);
 copyFileSync(builtLauncher, stagedLauncher);
 if (target.executableSuffix.length === 0) {
   chmodSync(stagedLauncher, 0o755);

scripts/validate-linux-package.sh

@@ -7,7 +7,7 @@ if [ "$#" -ne 1 ]; then
 fi
 
 deb=$1
-source_launcher=src-tauri/launchers/bin/procnote-launcher
+source_launcher=src-tauri/launchers/bin/procnote
 extract_dir=$(mktemp -d)
 trap 'rm -rf "$extract_dir"' EXIT HUP INT TERM
 
@@ -53,6 +53,11 @@ if ldd "$launcher" | grep -F 'libwebkit' >/dev/null || ldd "$launcher" | grep -F
   exit 1
 fi
 
+if [ -n "$(find "$extract_dir" -type f -name 'procnote-launcher' -print -quit)" ]; then
+  printf 'internal launcher filename is still packaged in the Debian package\n' >&2
+  exit 1
+fi
+
 desktop_file=$(find "$extract_dir/usr/share/applications" -type f -name '*.desktop' -print -quit)
 if [ -z "$desktop_file" ] || ! grep -F 'Exec=procnote-gui' "$desktop_file" >/dev/null; then
   printf 'desktop entry does not launch procnote-gui\n' >&2

scripts/validate-macos-package.sh

@@ -15,7 +15,7 @@ case $expected_arch in
     exit 2
     ;;
 esac
-source_launcher=src-tauri/launchers/bin/procnote-launcher
+source_launcher=src-tauri/launchers/bin/procnote
 mount_dir=$(mktemp -d)
 attached=false
 
@@ -78,5 +78,9 @@ if [ -e "$app/Contents/Resources/cli/procnote" ] || [ -e "$app/Contents/Resource
   printf 'legacy CLI executable is still packaged in the DMG\n' >&2
   exit 1
 fi
+if [ -n "$(find "$app" -type f -name 'procnote-launcher' -print -quit)" ]; then
+  printf 'internal launcher filename is still packaged in the DMG\n' >&2
+  exit 1
+fi
 
 printf 'Validated macOS package: %s\n' "$dmg"

scripts/validate-windows-package.ps1

@@ -212,7 +212,7 @@ if ($LASTEXITCODE -ne 0) {
 $gui = Join-Path $extractDir "procnote.exe"
 $launcher = Join-Path $extractDir "bin\procnote.exe"
 $pathUpdater = Join-Path $extractDir "installer\update-user-path.ps1"
-$sourceLauncher = Join-Path $PWD "src-tauri\launchers\bin\procnote-launcher.exe"
+$sourceLauncher = Join-Path $PWD "src-tauri\launchers\bin\procnote.exe"
 $sourcePathUpdater = Join-Path $PWD "src-tauri\nsis\update-user-path.ps1"
 
 $metadataJson = & cargo metadata --no-deps --format-version 1 | Out-String
@@ -245,6 +245,9 @@ if (Test-Path (Join-Path $extractDir "cli")) {
 if (Get-ChildItem $extractDir -Recurse -Filter "procnote.cmd" -File) {
     throw "Obsolete command-script launcher is still packaged"
 }
+if (Get-ChildItem $extractDir -Recurse -Filter "procnote-launcher.exe" -File) {
+    throw "NSIS still contains the internal launcher filename"
+}
 if ((Get-FileHash $sourceLauncher).Hash -ne (Get-FileHash $launcher).Hash) {
     throw "Packaged launcher differs from its freshly built source file"
 }
@@ -276,6 +279,9 @@ if ($msiLauncherMatches.Count -ne 1) {
 if (Get-ChildItem $msiExtractDir -Recurse -Filter "procnote.cmd" -File) {
     throw "MSI still contains the obsolete command-script launcher"
 }
+if (Get-ChildItem $msiExtractDir -Recurse -Filter "procnote-launcher.exe" -File) {
+    throw "MSI still contains the internal launcher filename"
+}
 if ($msiPathUpdaterMatches.Count -ne 1 -or
     -not $msiPathUpdaterMatches[0].FullName.EndsWith("\installer\update-user-path.ps1", [System.StringComparison]::OrdinalIgnoreCase)) {
     throw "MSI does not contain the packaged PATH updater under its installer directory"

src-tauri/launchers/README.md

@@ -20,9 +20,12 @@ The launcher resolves symlinks and locates the GUI from the package layout:
 - Linux packages name the GUI `procnote-gui` and install the launcher as
   `/usr/bin/procnote`.
 
-`scripts/prepare-launcher.mjs` builds the launcher for Tauri's target and stages
-it under the ignored `src-tauri/launchers/bin/` directory before Tauri compiles
-and bundles the app. `scripts/tauri.mjs` injects the matching
+`scripts/prepare-launcher.mjs` builds the launcher for Tauri's target and copies
+Cargo's `procnote-launcher[.exe]` artifact into the ignored
+`src-tauri/launchers/bin/` directory as the public `procnote[.exe]` filename.
+Bundle mappings preserve that basename instead of requesting a rename because
+the Tauri WiX bundler preserves a resource's source filename. `scripts/tauri.mjs`
+injects the matching
 `tauri.bundle.*.conf.json` extension for desktop builds, which places the staged
 binary at the paths above. Keeping generated-resource paths out of Tauri's
 automatically loaded platform configuration allows direct `cargo check` and

src-tauri/tauri.bundle.linux.conf.json

@@ -3,12 +3,12 @@
     "linux": {
       "deb": {
         "files": {
-          "/usr/bin/procnote": "launchers/bin/procnote-launcher"
+          "/usr/bin/procnote": "launchers/bin/procnote"
         }
       },
       "rpm": {
         "files": {
-          "/usr/bin/procnote": "launchers/bin/procnote-launcher"
+          "/usr/bin/procnote": "launchers/bin/procnote"
         }
       }
     }

src-tauri/tauri.bundle.macos.conf.json

@@ -1,7 +1,7 @@
 {
   "bundle": {
     "resources": {
-      "launchers/bin/procnote-launcher": "bin/procnote"
+      "launchers/bin/procnote": "bin/procnote"
     }
   }
 }

src-tauri/tauri.bundle.windows.conf.json

@@ -1,7 +1,7 @@
 {
   "bundle": {
     "resources": {
-      "launchers/bin/procnote-launcher.exe": "bin/procnote.exe",
+      "launchers/bin/procnote.exe": "bin/procnote.exe",
       "nsis/update-user-path.ps1": "installer/update-user-path.ps1"
     }
   }