refactor(build): Update branding references in build scripts for consistency

Author: Ryosuke-Asano

build.ts

@@ -28,8 +28,8 @@ export const brandingName = "Floorp";
 const VERSION = process.platform === "win32" ? "001" : "000";
 const binExtractDir = "_dist/bin";
 const binDir = process.platform !== "darwin"
-  ? `_dist/bin/${brandingBaseName}`
-  : `_dist/bin/${brandingBaseName}/${brandingName}.app/Contents/Resources`;
+  ? `_dist/bin/${brandingName}`
+  : `_dist/bin/${brandingName}/${brandingName}.app/Contents/Resources`;
 
 const _r = (dir: string) => {
   return pathe.resolve(import.meta.dirname as string, dir);
@@ -67,10 +67,10 @@ try {
   // ignore
 }
 
-const binPath = pathe.join(binDir, brandingBaseName);
+const binPath = pathe.join(binDir, brandingName);
 const binPathExe = process.platform !== "darwin"
   ? binPath + (process.platform === "win32" ? ".exe" : "")
-  : `./_dist/bin/${brandingBaseName}/${brandingName}.app/Contents/MacOS/${brandingBaseName}`;
+  : `./_dist/bin/${brandingName}/${brandingName}.app/Contents/MacOS/${brandingName}`;
 
 const binVersion = pathe.join(binDir, "nora.version.txt");
 
@@ -105,7 +105,7 @@ async function decompressBin() {
       try {
         const appDestBase = pathe.join(
           "./_dist/bin",
-          brandingBaseName,
+          brandingName,
           `${brandingName}.app`,
         );
         const destContents = pathe.join(appDestBase, macConfig.appDirName);
@@ -306,15 +306,15 @@ async function run(mode: "dev" | "test" | "release" = "dev") {
     await release("before");
     await injectManifest(binDir, "run-prod", "noraneko-dev");
     try {
-      await Deno.remove(`_dist/bin/${brandingBaseName}/noraneko-dev`, {
+      await Deno.remove(`_dist/bin/${brandingName}/noraneko-dev`, {
         recursive: true,
       });
     } catch {
       // ignore
     }
     await Deno.symlink(
       pathe.resolve(import.meta.dirname as string, "_dist/noraneko"),
-      `_dist/bin/${brandingBaseName}/noraneko-dev`,
+      `_dist/bin/${brandingName}/noraneko-dev`,
       { type: "junction" },
     );
   }

gecko/branding/floorp-daylight/configure.sh

@@ -3,6 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_DISPLAYNAME="Floorp Daylight"
-MOZ_APP_NAME="Floorp"
+MOZ_APP_NAME="floorp"
 MOZ_APP_VENDOR="Ablaze"
 MOZ_APP_REMOTINGNAME="floorp-daylight"

gecko/branding/floorp-official/configure.sh

@@ -3,6 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_DISPLAYNAME="Floorp"
-MOZ_APP_NAME="Floorp"
+MOZ_APP_NAME="floorp"
 MOZ_APP_VENDOR="Ablaze"
 MOZ_APP_REMOTINGNAME="floorp-default"

scripts/git-patches/git-patches-manager.ts

@@ -1,5 +1,5 @@
 /// <reference lib="deno.ns" />
-import { brandingBaseName, brandingName } from "../../build.ts";
+import { brandingName } from "../../build.ts";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { $ } from "zx";
@@ -9,8 +9,8 @@ import { existsSync } from "@std/fs";
 
 function getBinDir() {
   return process.platform !== "darwin"
-    ? `_dist/bin/${brandingBaseName}`
-    : `_dist/bin/${brandingBaseName}/${brandingName}.app/Contents/Resources`;
+    ? `_dist/bin/${brandingName}`
+    : `_dist/bin/${brandingName}/${brandingName}.app/Contents/Resources`;
 }
 
 const PATCHES_DIR = "scripts/git-patches/patches";

scripts/launchDev/child-browser.ts

@@ -1,4 +1,4 @@
-import { $, ProcessPromise } from "zx";
+import { $, type ProcessPromise } from "zx";
 import chalk from "chalk";
 import { usePwsh } from "zx";
 
@@ -66,8 +66,8 @@ function printFirefoxLog(lines: string[]) {
   }
 }
 
-import { type LogEntry, log } from "zx/core";
-import { brandingBaseName, brandingName } from "../../build.ts";
+import { log, type LogEntry } from "zx/core";
+import { brandingName } from "../../build.ts";
 
 $.log = (entry: LogEntry) => {
   // if the buffer is null, the process is on exit.
@@ -107,20 +107,26 @@ export async function runBrowser(port = 5180) {
   switch (Deno.build.os) {
     case "windows":
       processBrowser =
-        $`./_dist/bin/${brandingBaseName}/${brandingBaseName}.exe --profile ./_dist/profile/test --remote-debugging-port ${port} --wait-for-browser --jsdebugger`
-          .stdio("pipe");
+        $`./_dist/bin/${brandingName}/${brandingName}.exe --profile ./_dist/profile/test --remote-debugging-port ${port} --wait-for-browser --jsdebugger`
+          .stdio(
+            "pipe",
+          );
       break;
 
     case "linux":
       processBrowser =
-        $`./_dist/bin/${brandingBaseName}/${brandingBaseName} --profile ./_dist/profile/test --remote-debugging-port ${port} --wait-for-browser --jsdebugger`
-          .stdio("pipe");
+        $`./_dist/bin/${brandingName}/${brandingName} --profile ./_dist/profile/test --remote-debugging-port ${port} --wait-for-browser --jsdebugger`
+          .stdio(
+            "pipe",
+          );
       break;
 
     case "darwin":
       processBrowser =
-        $`./_dist/bin/${brandingBaseName}/${brandingName}.app/Contents/MacOS/${brandingBaseName} --profile ./_dist/profile/test --remote-debugging-port ${port} --wait-for-browser --jsdebugger`
-          .stdio("pipe");
+        $`./_dist/bin/${brandingName}/${brandingName}.app/Contents/MacOS/${brandingName} --profile ./_dist/profile/test --remote-debugging-port ${port} --wait-for-browser --jsdebugger`
+          .stdio(
+            "pipe",
+          );
       break;
   }
 
@@ -167,7 +173,8 @@ export async function runBrowser(port = 5180) {
   }
 }
 
-{ //* main
+{
+  //* main
   const decoder = new TextDecoder();
   (async () => {
     for await (const chunk of Deno.stdin.readable) {