wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1549 from brooksytech/dev

Browse source 
Disable PortMaster version of Moonlight
This commit is contained in:
Brooksytech 2023-06-09 13:59:15 -07:00 committed by GitHub
commit 722e0b79ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/apps/portmaster/sources/PortMaster.sh
View file

@ -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() {

2
packages/misc/modules/package.mk
View file

@ -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
}