From cf59d39599a762120fbfd118977b61e293ec53c9 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sat, 10 Oct 2026 16:52:33 -0400 Subject: [PATCH] Read the package catalogs from Droid-Deck/DroidDeck-Components (#544) The Windows components catalog, the desktop and emulator packages, the Linux runtime and the Steam seed now live on the organisation's components repository, mirrored and built there by CI; the app reads the catalogs from its main and the files from its releases. The personal winlator-contents mirror keeps serving older app versions and Bannerlator. --- .../java/com/droiddeck/launcher/runtime/DesktopCatalog.kt | 4 ++-- .../com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java | 2 +- .../main/java/com/droiddeck/launcher/session/WinComponents.kt | 2 +- .../droiddeck/launcher/session/WinComponentsSupportTest.kt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 761b6e9778..f24b267cd7 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -20,12 +20,12 @@ import java.io.File */ object DesktopCatalog { private const val TAG = "DesktopCatalog" - const val CATALOG_URL = "https://raw.githubusercontent.com/The412Banner/winlator-contents/main/desktop.json" + const val CATALOG_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/desktop.json" /** * Valve's Proton Experimental (ARM64) with its appmanifest, laid out as the client keeps it. * In a catalog of its own so it never shows among the packages a user picks from. */ - const val STEAM_SEED_URL = "https://raw.githubusercontent.com/The412Banner/winlator-contents/main/steam-seed.json" + const val STEAM_SEED_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/steam-seed.json" const val PROTON_SEED_ID = "proton-arm64" class Entry( diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index 305fd34f7f..c6d0fb22ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -41,7 +41,7 @@ public final class LinuxRuntimeInstaller { /** Catalog row, beside the other component catalogs in winlator-contents. */ public static final String CATALOG_URL = - "https://raw.githubusercontent.com/The412Banner/winlator-contents/main/linuxfs.json"; + "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/linuxfs.json"; private static final String VERSION_FILE = ".version"; diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt index baaae5b75e..8752fab154 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -38,7 +38,7 @@ import java.util.zip.ZipInputStream */ object WinComponents { private const val TAG = "WinComponents" - const val CATALOG_URL = "https://raw.githubusercontent.com/The412Banner/winlator-contents/main/components.json" + const val CATALOG_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/components.json" private const val SELECTION = "wincomponents.json" private const val GUEST_SELECTION = "root/.config/droiddeck/wincomponents.json" private const val STORE = "opt/droiddeck/wincomponents" diff --git a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt index d086ea6000..31dad07df0 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt @@ -11,7 +11,7 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [33]) class WinComponentsSupportTest { - private val base = "https://github.com/The412Banner/winlator-contents/releases/download/system-libraries-v1" + private val base = "https://github.com/Droid-Deck/DroidDeck-Components/releases/download/system-libraries-v1" private fun step(action: String, vararg pairs: Pair) = WinComponents.Step(action, JSONObject().apply { pairs.forEach { (k, v) -> put(k, v) } }) @@ -66,7 +66,7 @@ class WinComponentsSupportTest { } @Test fun recordedInstallersInstallHere() { - val snapshot = "https://github.com/The412Banner/winlator-contents/releases/download/component-snapshots-v1/K-Lite.snapshot.json" + val snapshot = "https://github.com/Droid-Deck/DroidDeck-Components/releases/download/component-snapshots-v1/K-Lite.snapshot.json" // A setup program with a recording of its result installs from the recording. val klite = WinComponents.Component("K-Lite", "", "", "ready", emptyList(), listOf(step("install_exe", "url" to "$base/K-Lite.exe", "file_name" to "K-Lite_1960.exe")), snapshot)