From f14a7240bbf4b6b02938893e40bf5864313cb8d6 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 25 Jan 2025 17:56:31 +0900
Subject: [PATCH 1/4] fix: add dependencies for Ubuntu 24

---
 src/dependencies.ts | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/dependencies.ts b/src/dependencies.ts
index 9508b4f..873606c 100644
--- a/src/dependencies.ts
+++ b/src/dependencies.ts
@@ -19,6 +19,25 @@ const DEBIAN_BASED_DEPENDENT_PACKAGES = [
   "xdg-utils",
 ];
 
+const UBUNTU_24_DEPENDENT_PACKAGES = [
+  "libasound2t64",
+  "libatk-bridge2.0-0",
+  "libatk1.0-0",
+  "libcairo2",
+  "libcups2",
+  "libdbus-1-3",
+  "libexpat1",
+  "libgbm1",
+  "libglib2.0-0",
+  "libnss3",
+  "libpango-1.0-0",
+  "libxcomposite1",
+  "libxdamage1",
+  "libxfixes3",
+  "libxkbcommon0",
+  "libxrandr2",
+];
+
 const FEDORA_BASED_DEPENDENT_PACKAGES = [
   "alsa-lib",
   "atk",
@@ -64,23 +83,26 @@ const installDependencies = async (
   }
 
   const packages = await (async () => {
-    const osReleaseId = await runtime.getOsReleaseId();
-    switch (osReleaseId) {
+    const { ID: id, VERSION_ID: versionId } = await runtime.loadOsRelease();
+    switch (id) {
       case "rhel":
       case "centos":
       case "ol":
       case "fedora":
         return FEDORA_BASED_DEPENDENT_PACKAGES;
       case "debian":
-      case "ubuntu":
       case "linuxmint":
         return DEBIAN_BASED_DEPENDENT_PACKAGES;
+      case "ubuntu":
+        return versionId === "24"
+          ? UBUNTU_24_DEPENDENT_PACKAGES
+          : DEBIAN_BASED_DEPENDENT_PACKAGES;
       case "opensuse":
       case "opensuse-leap":
       case "sles":
         return SUSE_BASED_DEPENDENT_PACKAGES;
     }
-    throw new Error(`Unsupported OS: ${osReleaseId}`);
+    throw new Error(`Unsupported OS: ${id}`);
   })();
   const sudo = !noSudo && process.getuid?.() !== 0;
 

From 9989ad2b2c0fc86457fdfc3af0199884621fc06e Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 25 Jan 2025 18:11:43 +0900
Subject: [PATCH 2/4] fix: check if ubuntu version is greater than or equal to
 24

---
 src/dependencies.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dependencies.ts b/src/dependencies.ts
index 873606c..7f685af 100644
--- a/src/dependencies.ts
+++ b/src/dependencies.ts
@@ -94,7 +94,7 @@ const installDependencies = async (
       case "linuxmint":
         return DEBIAN_BASED_DEPENDENT_PACKAGES;
       case "ubuntu":
-        return versionId === "24"
+        return parseInt(versionId.split(".")[0], 10) >= 24
           ? UBUNTU_24_DEPENDENT_PACKAGES
           : DEBIAN_BASED_DEPENDENT_PACKAGES;
       case "opensuse":

From c72805049c0a5ca4011eb23dbeee41c2fc821ee4 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 25 Jan 2025 18:13:21 +0900
Subject: [PATCH 3/4] fix: apply linting rules

---
 src/dependencies.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dependencies.ts b/src/dependencies.ts
index 7f685af..ca5c881 100644
--- a/src/dependencies.ts
+++ b/src/dependencies.ts
@@ -94,7 +94,7 @@ const installDependencies = async (
       case "linuxmint":
         return DEBIAN_BASED_DEPENDENT_PACKAGES;
       case "ubuntu":
-        return parseInt(versionId.split(".")[0], 10) >= 24
+        return Number.parseInt(versionId.split(".")[0], 10) >= 24
           ? UBUNTU_24_DEPENDENT_PACKAGES
           : DEBIAN_BASED_DEPENDENT_PACKAGES;
       case "opensuse":

From 80787c34f9713946fd133eb004a98dd71c459d1f Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 25 Jan 2025 18:23:47 +0900
Subject: [PATCH 4/4] fix: add t64 suffix to ubuntu 24 packages

---
 src/dependencies.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dependencies.ts b/src/dependencies.ts
index ca5c881..cd33e31 100644
--- a/src/dependencies.ts
+++ b/src/dependencies.ts
@@ -21,14 +21,14 @@ const DEBIAN_BASED_DEPENDENT_PACKAGES = [
 
 const UBUNTU_24_DEPENDENT_PACKAGES = [
   "libasound2t64",
-  "libatk-bridge2.0-0",
-  "libatk1.0-0",
+  "libatk-bridge2.0-0t64",
+  "libatk1.0-0t64",
   "libcairo2",
-  "libcups2",
+  "libcups2t64",
   "libdbus-1-3",
   "libexpat1",
   "libgbm1",
-  "libglib2.0-0",
+  "libglib2.0-0t64",
   "libnss3",
   "libpango-1.0-0",
   "libxcomposite1",