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

Fix starting PortMaster, ThemeMaster, and JELOSAddOns.

Browse source
This commit is contained in:
fewtarius 2022-10-15 08:02:48 -04:00
parent d2338ef3d4
commit 6dc9c27ca6
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
7 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/games/tools/jelosaddons/sources/autostart/common/012-jelosaddons
View file

@ -8,7 +8,6 @@ then
mkdir -p /storage/roms/ports/JelosAddOns
rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/
chmod -R 755 /storage/roms/ports/JelosAddOns
mv -f /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns
fi
#Check if gamelist.xml exists, if not create gamelist.xml to hide JelosAddOns by default.
@ -19,7 +18,7 @@ touch /storage/roms/ports/gamelist.xml
<?xml version="1.0"?>
<gameList>
<game>
<path>/storage/roms/ports/JelosAddOns.sh</path>
<path>/storage/roms/ports/JelosAddOns/JelosAddOns.sh</path>
<name>JelosAddOns</name>
<hidden>true</hidden>
</game>
@ -32,7 +31,7 @@ if ! grep -R "JelosAddOns" "/storage/roms/ports/gamelist.xml"
then
sed -i 's|<gameList>|& \
<game>\
<path>/storage/roms/ports/JelosAddOns.sh</path>\
<path>/storage/roms/ports/JelosAddOns/JelosAddOns.sh</path>\
<name>JelosAddOns</name>\
<hidden>true</hidden>\
</game>|' /storage/roms/ports/gamelist.xml

5
packages/games/tools/portmaster/sources/autostart/common/011-portmaster
View file

@ -8,7 +8,6 @@ then
mkdir -p /storage/roms/ports/PortMaster
rsync -a /usr/share/PortMaster/* /storage/roms/ports/PortMaster/
chmod -R 755 /storage/roms/ports/PortMaster
mv -f /storage/roms/ports/PortMaster/PortMaster.sh /storage/roms/ports/PortMaster.sh
fi
#Check if gamelist.xml exists, if not create gamelist.xml to hide portmaster by default.
@ -19,7 +18,7 @@ touch /storage/roms/ports/gamelist.xml
<?xml version="1.0"?>
<gameList>
<game>
<path>/storage/roms/ports/PortMaster.sh</path>
<path>/storage/roms/ports/PortMaster/PortMaster.sh</path>
<name>PortMaster</name>
<hidden>true</hidden>
</game>
@ -32,7 +31,7 @@ if ! grep -R "PortMaster" "/storage/roms/ports/gamelist.xml"
then
sed -i 's|<gameList>|& \
<game>\
<path>/storage/roms/ports/PortMaster.sh</path>\
<path>/storage/roms/ports/PortMaster/PortMaster.sh</path>\
<name>PortMaster</name>\
<hidden>true</hidden>\
</game>|' /storage/roms/ports/gamelist.xml

16
packages/jelos/sources/post-update
View file

@ -47,6 +47,7 @@ then
cp /usr/config/ssh/authorized_keys /storage/.ssh
fi
### Sync rsync configs
rsync --ignore-existing /usr/config/rsync-rules.conf /storage/.config/
rsync --ignore-existing /usr/config/rsync.conf /storage/.config/
@ -64,31 +65,40 @@ done
if [ ! -d "/storage/roms/ports/PortMaster" ]
then
mkdir -p /storage/roms/ports/PortMaster
else
rm -rf /storage/roms/ports/PortMaster
mkdir -p /storage/roms/ports/PortMaster
rm -f /storage/roms/ports/PortMaster.sh ||:
fi
rsync -a --delete /usr/share/PortMaster/* /storage/roms/ports/PortMaster/
chmod +x /storage/roms/ports/PortMaster -R
cp -f /storage/roms/ports/PortMaster/PortMaster.sh /storage/roms/ports/PortMaster.sh
# Ensure JelosAddOns is in sync
if [ ! -d "/storage/roms/ports/JelosAddOns" ]
then
mkdir -p /storage/roms/ports/JelosAddOns
else
rm -rf /storage/roms/ports/JelosAddOns
mkdir -p /storage/roms/ports/JelosAddOns
rm -f /storage/roms/ports/JelosAddOns.sh ||:
fi
rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/
chmod -R 755 /storage/roms/ports/JelosAddOns
cp -f /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns.sh
# Make sure ThemeMaster is in sync
if [ ! -d "/storage/roms/ports/ThemeMaster" ]
then
mkdir -p /storage/roms/ports/ThemeMaster
else
rm -rf /storage/roms/ports/ThemeMaster
mkdir -p /storage/roms/ports/ThemeMaster
rm -f /storage/roms/ports/ThemeMaster.sh ||:
fi
rsync -a /usr/share/ThemeMaster/* /storage/roms/ports/ThemeMaster/
chmod -R 755 /storage/roms/ports/ThemeMaster
cp -f /storage/roms/ports/ThemeMaster/ThemeMaster /storage/roms/ports/ThemeMaster.sh
# Default modules need to be updated to use the new stop/start ui function.
rsync -av /usr/config/modules/* /storage/.config/modules/

3
packages/misc/modules/sources/JelosAddOns.sh
View file

@ -9,4 +9,5 @@ if [ "${UI_SERVICE}" = "weston.service" ]
then
sed -i -e "s#/dev/tty0#/dev/tty#" /storage/roms/ports/JelosAddOns.sh
fi
/storage/roms/ports/JelosAddOns.sh
cd /storage/roms/ports/JelosAddOns
./JelosAddOns.sh

4
packages/misc/modules/sources/PortMaster.sh
View file

@ -10,4 +10,6 @@ if [ "${UI_SERVICE}" = "weston.service" ]
then
sed -i -e "s#/dev/tty0#/dev/tty#" /storage/roms/ports/PortMaster.sh
fi
/storage/roms/ports/PortMaster.sh
cd /storage/roms/ports/PortMaster
./PortMaster.sh

3
packages/misc/modules/sources/ThemeMaster.sh
View file

@ -11,4 +11,5 @@ then
sed -i -e "s#/dev/tty1#/dev/tty#" /storage/roms/ports/ThemeMaster/ThemeMaster
fi
/storage/roms/ports/ThemeMaster.sh
cd /storage/roms/ports/ThemeMaster
./ThemeMaster.sh

5
packages/themes/thememaster/sources/autostart/common/011-thememaster
View file

@ -9,7 +9,6 @@ then
mkdir -p /storage/roms/ports/ThemeMaster
rsync -a /usr/share/ThemeMaster/* /storage/roms/ports/ThemeMaster/
chmod -R 755 /storage/roms/ports/ThemeMaster
mv -f /storage/roms/ports/ThemeMaster/ThemeMaster.sh /storage/roms/ports/ThemeMaster.sh
fi
#Check if gamelist.xml exists, if not create gamelist.xml to hide ThemeMaster by default.
@ -20,7 +19,7 @@ touch /storage/roms/ports/gamelist.xml
<?xml version="1.0"?>
<gameList>
<game>
<path>/storage/roms/ports/ThemeMaster.sh</path>
<path>/storage/roms/ports/ThemeMaster/ThemeMaster.sh</path>
<name>ThemeMaster</name>
<hidden>true</hidden>
</game>
@ -33,7 +32,7 @@ if ! grep -R "ThemeMaster" "/storage/roms/ports/gamelist.xml"
then
sed -i 's|<gameList>|& \
<game>\
<path>/storage/roms/ports/ThemeMaster.sh</path>\
<path>/storage/roms/ports/ThemeMaster/ThemeMaster.sh</path>\
<name>ThemeMaster</name>\
<hidden>true</hidden>\
</game>|' /storage/roms/ports/gamelist.xml