From 2ba40c1aad24fb4d4f5cef0bb8dded8bb0cf1abb Mon Sep 17 00:00:00 2001
From: mason <macebrooks@gmail.com>
Date: Fri, 9 Jun 2023 20:56:32 +0000
Subject: [PATCH] Disable PortMaster version of Moonlight

---
 packages/apps/portmaster/sources/PortMaster.sh | 4 ++++
 packages/misc/modules/package.mk               | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/apps/portmaster/sources/PortMaster.sh b/packages/apps/portmaster/sources/PortMaster.sh
index 01a5fc155..ffe763e72 100644
--- a/packages/apps/portmaster/sources/PortMaster.sh
+++ b/packages/apps/portmaster/sources/PortMaster.sh
@@ -76,6 +76,10 @@ fi
 $WGET -t 3 -T 60 --no-check-certificate "$website"ports.md -O /dev/shm/portmaster/pports.md
 $WGET -t 3 -T 60 --no-check-certificate "$jwebsite"jports.md -O /dev/shm/portmaster/jports.md
 
+#JELOS has moonlight built in, dont use PortMaster's version.
+sed -i '/Title="Moonlight ."/d' /dev/shm/portmaster/pports.md
+
+#Combine PortMaster with JelosAddOns
 cat /dev/shm/portmaster/pports.md /dev/shm/portmaster/jports.md > /dev/shm/portmaster/ports.md
 
 PortInfoInstall() {
diff --git a/packages/misc/modules/package.mk b/packages/misc/modules/package.mk
index fe23b8274..b04137c55 100644
--- a/packages/misc/modules/package.mk
+++ b/packages/misc/modules/package.mk
@@ -29,7 +29,6 @@ post_makeinstall_target() {
     x86_64)
       rm -f ${INSTALL}/usr/config/modules/*32bit*
       rm -f ${INSTALL}/usr/config/modules/*Master*
-      rm -f ${INSTALL}/usr/config/modules/*351Files*
     ;;
     *)
       rm -f ${INSTALL}/usr/config/modules/Install*
@@ -38,6 +37,7 @@ post_makeinstall_target() {
   case ${DEVICE} in
     S922X*)
       rm -f ${INSTALL}/usr/config/modules/*ScummVM*
+      rm -f ${INSTALL}/usr/config/modules/*32bit*
     ;;
   esac
 }