From a1d13f276af11cf76b791e7779927ee03075e4b8 Mon Sep 17 00:00:00 2001 From: purian23 Date: Tue, 17 Mar 2026 21:23:01 -0400 Subject: [PATCH] dankinstall(debian): Minor update to ARM64 support --- core/internal/distros/debian.go | 14 ++++++++++++-- distro/debian/dms/debian/control | 2 +- distro/debian/dms/debian/source/include-binaries | 1 + distro/debian/dms/debian/source/options | 1 + 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/core/internal/distros/debian.go b/core/internal/distros/debian.go index 13d90987..771eabf8 100644 --- a/core/internal/distros/debian.go +++ b/core/internal/distros/debian.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "os/exec" - "runtime" "strings" "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" @@ -97,6 +96,17 @@ func (d *DebianDistribution) packageInstalled(pkg string) bool { return err == nil } +func debianRepoArchitecture(arch string) string { + switch arch { + case "amd64", "x86_64": + return "amd64" + case "arm64", "aarch64": + return "arm64" + default: + return arch + } +} + func (d *DebianDistribution) GetPackageMapping(wm deps.WindowManager) map[string]PackageMapping { return d.GetPackageMappingWithVariants(wm, make(map[string]deps.PackageVariant)) } @@ -436,7 +446,7 @@ func (d *DebianDistribution) enableOBSRepos(ctx context.Context, obsPkgs []Packa } // Add repository - repoLine := fmt.Sprintf("deb [signed-by=%s arch=%s] %s/ /", keyringPath, runtime.GOARCH, baseURL) + repoLine := fmt.Sprintf("deb [signed-by=%s arch=%s] %s/ /", keyringPath, debianRepoArchitecture(osInfo.Architecture), baseURL) progressChan <- InstallProgressMsg{ Phase: PhaseSystemPackages, diff --git a/distro/debian/dms/debian/control b/distro/debian/dms/debian/control index 04b9a76e..bc8613df 100644 --- a/distro/debian/dms/debian/control +++ b/distro/debian/dms/debian/control @@ -9,7 +9,7 @@ Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git Package: dms -Architecture: amd64 +Architecture: amd64 arm64 Depends: ${misc:Depends}, quickshell | quickshell-git, accountsservice, diff --git a/distro/debian/dms/debian/source/include-binaries b/distro/debian/dms/debian/source/include-binaries index bac25ab7..31b2b357 100644 --- a/distro/debian/dms/debian/source/include-binaries +++ b/distro/debian/dms/debian/source/include-binaries @@ -1,2 +1,3 @@ dms-distropkg-amd64.gz +dms-distropkg-arm64.gz dms-source.tar.gz diff --git a/distro/debian/dms/debian/source/options b/distro/debian/dms/debian/source/options index 02a6b4b5..e9e5bf74 100644 --- a/distro/debian/dms/debian/source/options +++ b/distro/debian/dms/debian/source/options @@ -1,4 +1,5 @@ # Include files that are normally excluded by .gitignore # These are needed for the build process on Launchpad tar-ignore = !dms-distropkg-amd64.gz +tar-ignore = !dms-distropkg-arm64.gz tar-ignore = !dms-source.tar.gz