From 2ed4741891e64e87d65433a3af9cf55975840db3 Mon Sep 17 00:00:00 2001
From: cmitu <31816814+cmitu@users.noreply.github.com>
Date: Wed, 22 Jul 2026 03:47:06 +0000
Subject: [PATCH] packages: map the 7zip packages for newer distros

Both `p7zip` and `p7zip-full` are replaced by `7zip` in recent (Trixie) Debian and Ubuntu (26.04).
Map the packages in our helper since they're used in more than one place.
---
 scriptmodules/helpers.sh                    | 3 +++
 scriptmodules/supplementary/retropiemenu.sh | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
index 087d1ac223..e40a87d41f 100755
--- a/scriptmodules/helpers.sh
+++ b/scriptmodules/helpers.sh
@@ -303,6 +303,9 @@ function _mapPackage() {
             [[ "$__os_debian_ver" -lt 13 ]] && pkg="policykit-1"
             [[ -n "$__os_ubuntu_ver" ]] && compareVersions "$__os_ubuntu_ver" lt 24.04 && pkg="policykit-1"
             ;;
+        p7zip|p7zip-full)
+            [[ -n "$__os_ubuntu_ver" ]] && compareVersions "$__os_ubuntu_ver" ge 26.04 && pkg="7zip"
+            [[ "$__os_debian_ver" -ge 13 ]] && pkg="7zip"
     esac
     echo "$pkg"
 }
diff --git a/scriptmodules/supplementary/retropiemenu.sh b/scriptmodules/supplementary/retropiemenu.sh
index 2ac17bea04..c27d57ecfb 100644
--- a/scriptmodules/supplementary/retropiemenu.sh
+++ b/scriptmodules/supplementary/retropiemenu.sh
@@ -24,12 +24,7 @@ function _update_hook_retropiemenu() {
 }
 
 function depends_retropiemenu() {
-    local p7zip_pkg="p7zip"
-    # Ubuntu 26.04+ renamed p7zip to 7zip
-    if [[ "$__os_id" == "Ubuntu" ]] && compareVersions "$__os_ubuntu_ver" ge "26.04"; then
-        p7zip_pkg="7zip"
-    fi
-    getDepends mc "$p7zip_pkg"
+    getDepends mc p7zip
 }
 
 function install_bin_retropiemenu() {