From 87b36d4635393982e40df8a7f706ca5452122bd3 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sun, 23 Jul 2023 13:47:19 +0000 Subject: [PATCH] Update dolphin-sa and primehack ES settings, adjust multiple scripts to improve execution time. --- .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../S922X/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../apps/moonlight/autostart/010-moonlight | 4 ++-- .../retroarch/autostart/001-controller | 9 ++++---- .../hardware/quirks/autostart/020-configs | 16 ++++++++------ .../devices/Anbernic RG353P/005-game-configs | 8 +++---- .../devices/Anbernic RG353V/005-game-configs | 8 +++---- .../devices/Anbernic RG503/005-game-configs | 4 ++-- .../devices/Powkiddy RK2023/005-game-configs | 8 +++---- .../quirks/devices/Powkiddy x55/002-hdmi | 4 ++-- .../devices/Powkiddy x55/005-game-configs | 8 +++---- packages/jelos/sources/scripts/setrootpass | 4 +++- .../network/bluez/autostart/009-bluetooth | 22 ++++++++++--------- .../wireguard-tools/autostart/098-wireguard | 12 +++++----- packages/sysutils/autostart/sources/autostart | 2 ++ packages/virtual/emulators/package.mk | 12 ++++++++-- 20 files changed, 76 insertions(+), 57 deletions(-) diff --git a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md index e3bd8831e..9610dec13 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -71,7 +71,7 @@ This document describes all available systems emulators and cores available for |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)
**retroarch:** gbsp
**retroarch:** vbam
**retroarch:** vba_next
**retroarch:** beetle_gba
| |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| -|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**primehack:** primehack
**retroarch:** dolphin
| +|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**retroarch:** dolphin
**primehack:** primehack
| |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)
**retroarch:** beetle_supafaust
| |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)
**retroarch:** mupen64plus
**retroarch:** parallel_n64
**mupen64plus-sa:** m64p_gliden64
**mupen64plus-sa:** m64p_gl64mk2
**mupen64plus-sa:** m64p_rice
| |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)
**retroarch:** fceumm
**retroarch:** quicknes
**retroarch:** mesen
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md index d38ab4775..6cf925919 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)
**retroarch:** gbsp
**retroarch:** vbam
**retroarch:** vba_next
**retroarch:** beetle_gba
| |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| -|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**primehack:** primehack
**retroarch:** dolphin
| +|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**retroarch:** dolphin
| |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)
**retroarch:** beetle_supafaust
| |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)
**retroarch:** mupen64plus
**retroarch:** parallel_n64
**mupen64plus-sa:** m64p_gliden64
**mupen64plus-sa:** m64p_gl64mk2
**mupen64plus-sa:** m64p_rice
| |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)
**retroarch:** fceumm
**retroarch:** quicknes
**retroarch:** mesen
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md index d2d68ee66..0f991d5fa 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md @@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)
**retroarch:** gbsp
**retroarch:** vbam
**retroarch:** vba_next
**retroarch:** beetle_gba
| |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| -|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**primehack:** primehack
**retroarch:** dolphin
| +|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**retroarch:** dolphin
| |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)
**retroarch:** beetle_supafaust
| |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)
**retroarch:** mupen64plus
**retroarch:** parallel_n64
**mupen64plus-sa:** m64p_gliden64
**mupen64plus-sa:** m64p_gl64mk2
**mupen64plus-sa:** m64p_rice
| |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)
**retroarch:** fceumm
**retroarch:** quicknes
**retroarch:** mesen
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md index d2d68ee66..0f991d5fa 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md @@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)
**retroarch:** gbsp
**retroarch:** vbam
**retroarch:** vba_next
**retroarch:** beetle_gba
| |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| -|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**primehack:** primehack
**retroarch:** dolphin
| +|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**retroarch:** dolphin
| |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)
**retroarch:** beetle_supafaust
| |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)
**retroarch:** mupen64plus
**retroarch:** parallel_n64
**mupen64plus-sa:** m64p_gliden64
**mupen64plus-sa:** m64p_gl64mk2
**mupen64plus-sa:** m64p_rice
| |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)
**retroarch:** fceumm
**retroarch:** quicknes
**retroarch:** mesen
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md index 9844b2533..0954d0980 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md @@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)
**retroarch:** gbsp
**retroarch:** vbam
**retroarch:** vba_next
**retroarch:** beetle_gba
| |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| -|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**primehack:** primehack
**retroarch:** dolphin
| +|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**retroarch:** dolphin
| |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)
**retroarch:** beetle_supafaust
| |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)
**retroarch:** mupen64plus
**retroarch:** parallel_n64
**mupen64plus-sa:** m64p_gliden64
**mupen64plus-sa:** m64p_gl64mk2
**mupen64plus-sa:** m64p_rice
| |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)
**retroarch:** fceumm
**retroarch:** quicknes
**retroarch:** mesen
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md index 09018d7b5..77ace2fc5 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md @@ -70,7 +70,7 @@ This document describes all available systems emulators and cores available for |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)
**retroarch:** gbsp
**retroarch:** vbam
**retroarch:** vba_next
**retroarch:** beetle_gba
| |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)
**retroarch:** sameboy
**retroarch:** gearboy
**retroarch:** tgbdual
**retroarch:** mgba
**retroarch:** vbam
| -|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**primehack:** primehack
**retroarch:** dolphin
| +|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)
**retroarch:** dolphin
| |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)
**retroarch:** beetle_supafaust
| |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)
**retroarch:** mupen64plus
**retroarch:** parallel_n64
**mupen64plus-sa:** m64p_gliden64
**mupen64plus-sa:** m64p_gl64mk2
**mupen64plus-sa:** m64p_rice
| |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)
**retroarch:** fceumm
**retroarch:** quicknes
**retroarch:** mesen
| diff --git a/packages/apps/moonlight/autostart/010-moonlight b/packages/apps/moonlight/autostart/010-moonlight index 5b406d66b..082841506 100755 --- a/packages/apps/moonlight/autostart/010-moonlight +++ b/packages/apps/moonlight/autostart/010-moonlight @@ -11,5 +11,5 @@ then cp /usr/config/moonlight/moonlight.conf /storage/.config/moonlight/moonlight.conf fi -sed -i "s#@MWIDTH@#${FBWIDTH}#g" /storage/.config/moonlight/moonlight.conf -sed -i "s#@MHEIGHT@#${FBHEIGHT}#g" /storage/.config/moonlight/moonlight.conf +sed -i "s#@MWIDTH@#${FBWIDTH}#g; + s#@MHEIGHT@#${FBHEIGHT}#g" /storage/.config/moonlight/moonlight.conf diff --git a/packages/emulators/standalone/retroarch/autostart/001-controller b/packages/emulators/standalone/retroarch/autostart/001-controller index 50f6ebe72..7e94b279c 100755 --- a/packages/emulators/standalone/retroarch/autostart/001-controller +++ b/packages/emulators/standalone/retroarch/autostart/001-controller @@ -4,7 +4,8 @@ . /etc/profile -### Set up our controller variables. -tocon "Configuring controller..." -/usr/bin/mkcontroller - +( + ### Set up our controller variables. + tocon "Configuring controller..." + /usr/bin/mkcontroller +) & diff --git a/packages/hardware/quirks/autostart/020-configs b/packages/hardware/quirks/autostart/020-configs index b084e2907..9f251b1a7 100755 --- a/packages/hardware/quirks/autostart/020-configs +++ b/packages/hardware/quirks/autostart/020-configs @@ -4,10 +4,12 @@ . /etc/profile -if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ] && \ - [ ! -f ".quirkconfigs" ] -then - tocon "Applying ${QUIRK_DEVICE} specific configuration..." - rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ 2>/dev/null - touch /storage/.quirkconfigs -fi +( + if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ] && \ + [ ! -f ".quirkconfigs" ] + then + tocon "Applying ${QUIRK_DEVICE} specific configuration..." + rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ 2>/dev/null + touch /storage/.quirkconfigs + fi +) & diff --git a/packages/hardware/quirks/devices/Anbernic RG353P/005-game-configs b/packages/hardware/quirks/devices/Anbernic RG353P/005-game-configs index 3b92c3267..97a2de3e0 100644 --- a/packages/hardware/quirks/devices/Anbernic RG353P/005-game-configs +++ b/packages/hardware/quirks/devices/Anbernic RG353P/005-game-configs @@ -7,8 +7,8 @@ #Set up gzdoom if [ ! -d "/storage/.config/gzdoom/" ]; then cp -rf /usr/config/gzdoom /storage/.config/ - sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini - sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini + sed -i '/Joy10=/c\Joy10=togglemap; + /Joy9=/c\Joy9=menu_main; + /vid_defheight=/c\vid_defheight=480; + /vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini fi diff --git a/packages/hardware/quirks/devices/Anbernic RG353V/005-game-configs b/packages/hardware/quirks/devices/Anbernic RG353V/005-game-configs index 3b92c3267..97a2de3e0 100644 --- a/packages/hardware/quirks/devices/Anbernic RG353V/005-game-configs +++ b/packages/hardware/quirks/devices/Anbernic RG353V/005-game-configs @@ -7,8 +7,8 @@ #Set up gzdoom if [ ! -d "/storage/.config/gzdoom/" ]; then cp -rf /usr/config/gzdoom /storage/.config/ - sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini - sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini + sed -i '/Joy10=/c\Joy10=togglemap; + /Joy9=/c\Joy9=menu_main; + /vid_defheight=/c\vid_defheight=480; + /vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini fi diff --git a/packages/hardware/quirks/devices/Anbernic RG503/005-game-configs b/packages/hardware/quirks/devices/Anbernic RG503/005-game-configs index cc2317fd3..4908b8ada 100644 --- a/packages/hardware/quirks/devices/Anbernic RG503/005-game-configs +++ b/packages/hardware/quirks/devices/Anbernic RG503/005-game-configs @@ -5,5 +5,5 @@ . /etc/profile #Set gzdoom resolution -sed -i '/vid_defheight=/c\vid_defheight=544' /storage/.config/gzdoom/gzdoom.ini -sed -i '/vid_defwidth=/c\vid_defwidth=960' /storage/.config/gzdoom/gzdoom.ini +sed -i '/vid_defheight=/c\vid_defheight=544; + /vid_defwidth=/c\vid_defwidth=960' /storage/.config/gzdoom/gzdoom.ini diff --git a/packages/hardware/quirks/devices/Powkiddy RK2023/005-game-configs b/packages/hardware/quirks/devices/Powkiddy RK2023/005-game-configs index e405907dd..7d485e732 100644 --- a/packages/hardware/quirks/devices/Powkiddy RK2023/005-game-configs +++ b/packages/hardware/quirks/devices/Powkiddy RK2023/005-game-configs @@ -7,8 +7,8 @@ #Set up gzdoom if [ ! -d "/storage/.config/gzdoom/" ]; then cp -rf /usr/config/gzdoom /storage/.config/ - sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini - sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini + sed -i '/Joy10=/c\Joy10=togglemap; + /Joy9=/c\Joy9=menu_main; + /vid_defheight=/c\vid_defheight=480; + /vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini fi diff --git a/packages/hardware/quirks/devices/Powkiddy x55/002-hdmi b/packages/hardware/quirks/devices/Powkiddy x55/002-hdmi index 322fee6d2..01cdd2d11 100755 --- a/packages/hardware/quirks/devices/Powkiddy x55/002-hdmi +++ b/packages/hardware/quirks/devices/Powkiddy x55/002-hdmi @@ -22,8 +22,8 @@ hdmi_con() { ### Test for an HDMI connection and if there is none, configure the system to use ### a rotation patched SDL2. cat </storage/.config/profile.d/006-hdmi -HDMI=\$(modetest 2>/dev/null | awk '/HDMI-/ {print \$3}') -if [ ! "\${HDMI}" = "connected" ] +HDMI="\$(cat /sys/class/extcon/hdmi/state)" +if [ ! "\${HDMI}" = "HDMI=1" ] then SDL=\$(readlink -f /usr/lib/SDL2-rotated/libSDL2.so 2>/dev/null) export LD_PRELOAD="\${SDL}" diff --git a/packages/hardware/quirks/devices/Powkiddy x55/005-game-configs b/packages/hardware/quirks/devices/Powkiddy x55/005-game-configs index e931a071c..762f2469b 100755 --- a/packages/hardware/quirks/devices/Powkiddy x55/005-game-configs +++ b/packages/hardware/quirks/devices/Powkiddy x55/005-game-configs @@ -7,8 +7,8 @@ #Set up gzdoom if [ ! -d "/storage/.config/gzdoom/" ]; then cp -rf /usr/config/gzdoom /storage/.config/ - sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini - sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defheight=/c\vid_defheight=720' /storage/.config/gzdoom/gzdoom.ini - sed -i '/vid_defwidth=/c\vid_defwidth=1280' /storage/.config/gzdoom/gzdoom.ini + sed -i '/Joy10=/c\Joy10=togglemap; + /Joy9=/c\Joy9=menu_main; + /vid_defheight=/c\vid_defheight=720; + /vid_defwidth=/c\vid_defwidth=1280' /storage/.config/gzdoom/gzdoom.ini fi diff --git a/packages/jelos/sources/scripts/setrootpass b/packages/jelos/sources/scripts/setrootpass index 7a29a263e..5bacbe178 100755 --- a/packages/jelos/sources/scripts/setrootpass +++ b/packages/jelos/sources/scripts/setrootpass @@ -26,7 +26,9 @@ set_setting root.password "${ROOTPASS}" # Restart syncthing if it was enabled. SYNCSTATUS=$(get_setting syncthing.enabled) -if [ "${SYNCSTATUS}" = "1" ] +SYNCACTIVE=$(systemctl status syncthing | awk '/active/ {print $2}') +if [ "${SYNCSTATUS}" = "1" ] && + [ "${SYNCACTIVE}" = "active" ] then systemctl restart syncthing >/dev/null 2>&1 fi diff --git a/packages/network/bluez/autostart/009-bluetooth b/packages/network/bluez/autostart/009-bluetooth index 64d75f70b..1edec47bd 100755 --- a/packages/network/bluez/autostart/009-bluetooth +++ b/packages/network/bluez/autostart/009-bluetooth @@ -2,13 +2,15 @@ . /etc/profile -if [ "$(get_setting bluetooth.enabled)" == "1" ] -then - tocon "Starting bluetooth..." - nohup systemctl start bluetooth & - nohup systemctl start bluetooth-agent & - nohup systemctl start bluetoothsense & - rfkill unblock bluetooth -else - rfkill block bluetooth -fi +( + if [ "$(get_setting bluetooth.enabled)" == "1" ] + then + tocon "Starting bluetooth..." + nohup systemctl start bluetooth & + nohup systemctl start bluetooth-agent & + nohup systemctl start bluetoothsense & + rfkill unblock bluetooth + else + rfkill block bluetooth + fi +) & diff --git a/packages/network/wireguard-tools/autostart/098-wireguard b/packages/network/wireguard-tools/autostart/098-wireguard index 0daa8cec8..dff75b928 100755 --- a/packages/network/wireguard-tools/autostart/098-wireguard +++ b/packages/network/wireguard-tools/autostart/098-wireguard @@ -4,8 +4,10 @@ . /etc/profile -if [ "$(get_setting wireguard.up)" == "1" ] -then - tocon "Enabling wireguard..." - nohup wg-quick up /storage/.config/wireguard/wg0.conf & -fi +( + if [ "$(get_setting wireguard.up)" == "1" ] + then + tocon "Enabling wireguard..." + nohup wg-quick up /storage/.config/wireguard/wg0.conf & + fi +) & diff --git a/packages/sysutils/autostart/sources/autostart b/packages/sysutils/autostart/sources/autostart index 3c58db2cf..3746b392a 100755 --- a/packages/sysutils/autostart/sources/autostart +++ b/packages/sysutils/autostart/sources/autostart @@ -33,6 +33,7 @@ do log "Run ${script}" ${script} 2>&1 >>${BOOTLOG} done +wait ### Run custom start scripts if [ -d "/storage/.config/autostart" ] @@ -43,6 +44,7 @@ then ${script} 2>&1 >>${BOOTLOG} done fi +wait tocon "Starting user interface..." log "Startup complete..." diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 372f1e2cc..a241fe142 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -406,13 +406,21 @@ makeinstall_target() { ### Nintendo GameCube case ${DEVICE} in - AMD64|RK358*|RK356*|S922X*|RK3399) + AMD64|RK356*|S922X*|RK3399) add_emu_core gamecube dolphin dolphin-sa-gc true - add_emu_core gamecube primehack primehack false + ;; + esac + case ${DEVICE} in + AMD64|RK358*|RK356*|S922X*|RK3399) add_emu_core gamecube retroarch dolphin false add_es_system gamecube ;; esac + case ${DEVICE} in + AMD64) + add_emu_core gamecube primehack primehack false + ;; + esac ### Nintendo Wii case ${DEVICE} in