From 45676e2196e0336f1e75265e84ccda2b9241c2d3 Mon Sep 17 00:00:00 2001 From: Schmurtz Date: Fri, 20 Oct 2023 11:53:23 +0200 Subject: [PATCH 1/4] Moving Netplay.sh move from App/romscripts/emu to App/romscripts Now available from favorites and recent sections. --- static/build/App/romscripts/{emu => }/Netplay.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename static/build/App/romscripts/{emu => }/Netplay.sh (100%) diff --git a/static/build/App/romscripts/emu/Netplay.sh b/static/build/App/romscripts/Netplay.sh similarity index 100% rename from static/build/App/romscripts/emu/Netplay.sh rename to static/build/App/romscripts/Netplay.sh From d939ccd30ef99199e940fd77370e0c765ad4df9c Mon Sep 17 00:00:00 2001 From: Schmurtz Date: Fri, 20 Oct 2023 12:25:23 +0200 Subject: [PATCH 2/4] Moving Scraper.sh make it available from every roms menu (including favorites and recent) --- .../build/App/romscripts/{emu => }/Scraper.sh | 0 static/build/App/romscripts/rapp/Scraper.sh | 23 ------------------- 2 files changed, 23 deletions(-) rename static/build/App/romscripts/{emu => }/Scraper.sh (100%) delete mode 100644 static/build/App/romscripts/rapp/Scraper.sh diff --git a/static/build/App/romscripts/emu/Scraper.sh b/static/build/App/romscripts/Scraper.sh similarity index 100% rename from static/build/App/romscripts/emu/Scraper.sh rename to static/build/App/romscripts/Scraper.sh diff --git a/static/build/App/romscripts/rapp/Scraper.sh b/static/build/App/romscripts/rapp/Scraper.sh deleted file mode 100644 index 24f8df0fa6..0000000000 --- a/static/build/App/romscripts/rapp/Scraper.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -scriptlabel="Scraper (%LIST%)" -require_networking=1 -echo $0 $* - -sysdir=/mnt/SDCARD/.tmp_update -rm -f /tmp/scraper_script.sh - -pressMenu2Kill st & - -cd $sysdir -#./bin/st -q -e "/mnt/SDCARD/scrap_screenscraper.sh" "MD" # quick alternative -./bin/st -q -e "$sysdir/script/scraper/menu.sh" "$1" "$2" - -pkill -9 pressMenu2Kill - - -# background scraping : -if [ -f /tmp/scraper_script.sh ]; then - chmod a+x /tmp/scraper_script.sh - sh /tmp/scraper_script.sh & -fi - From 4c8ccfd219818227ec2f186466664330184e84a1 Mon Sep 17 00:00:00 2001 From: Schmurtz Date: Fri, 20 Oct 2023 12:25:58 +0200 Subject: [PATCH 3/4] Create migration script for GLO Netplay and Scraper --- .../script/migration/00016_remove_old_glo_entries.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 static/build/.tmp_update/script/migration/00016_remove_old_glo_entries.sh diff --git a/static/build/.tmp_update/script/migration/00016_remove_old_glo_entries.sh b/static/build/.tmp_update/script/migration/00016_remove_old_glo_entries.sh new file mode 100644 index 0000000000..d90d82a542 --- /dev/null +++ b/static/build/.tmp_update/script/migration/00016_remove_old_glo_entries.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +cd /mnt/SDCARD/App/romscripts +rm -f \ + "./emu/Netplay.sh" \ + "./emu/Scraper.sh" \ + "./rapp/Scraper.sh" \ + 2> /dev/null From a2b29c7878bee3a931e542660ea08f6469322928 Mon Sep 17 00:00:00 2001 From: Aemiii91 <44569252+Aemiii91@users.noreply.github.com> Date: Fri, 20 Oct 2023 23:44:40 +0200 Subject: [PATCH 4/4] Improve netplay menu item labels (host/join) --- static/build/App/romscripts/Netplay.sh | 31 ++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/static/build/App/romscripts/Netplay.sh b/static/build/App/romscripts/Netplay.sh index ee5c2d2c64..e6142ed4b9 100644 --- a/static/build/App/romscripts/Netplay.sh +++ b/static/build/App/romscripts/Netplay.sh @@ -29,27 +29,27 @@ if [ "$3" = "DynamicLabel" ]; then fi fi - echo -n "$DynamicLabel" >/tmp/DynamicLabel.tmp + echo -n "$DynamicLabel" > /tmp/DynamicLabel.tmp exit fi -echo performance >/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor +echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor cores_configurator() { if [ "$romdirname" == "GB" ] || [ "$romdirname" == "GBC" ]; then tgb_dual_opts="/mnt/SDCARD/Saves/CurrentProfile/config/TGB Dual/TGB Dual.opt" tgb_dual_opts_tmp="/tmp/TGB Dual.patch" - echo -e "tgbdual_single_screen_mp = \"player ${PlayerNum} only\"" >"$tgb_dual_opts_tmp" - echo -e "tgbdual_audio_output = \"Game Boy #${PlayerNum}\"" >>"$tgb_dual_opts_tmp" + echo -e "tgbdual_single_screen_mp = \"player ${PlayerNum} only\"" > "$tgb_dual_opts_tmp" + echo -e "tgbdual_audio_output = \"Game Boy #${PlayerNum}\"" >> "$tgb_dual_opts_tmp" $sysdir/script/patch_ra_cfg.sh "$tgb_dual_opts_tmp" "$tgb_dual_opts" rm "$tgb_dual_opts_tmp" fi if [ "$romdirname" == "MD" ]; then pico_opts_tmp="/tmp/MD.patch" - echo -e "picodrive_input1 = \"6 button pad\"" >"$pico_opts_tmp" - echo -e "picodrive_input2 = \"6 button pad\"" >>"$pico_opts_tmp" + echo -e "picodrive_input1 = \"6 button pad\"" > "$pico_opts_tmp" + echo -e "picodrive_input2 = \"6 button pad\"" >> "$pico_opts_tmp" $sysdir/script/patch_ra_cfg.sh "$pico_opts_tmp" "/mnt/SDCARD/Saves/CurrentProfile/config/PicoDrive/PicoDrive.opt" rm "$pico_opts_tmp" fi @@ -65,8 +65,8 @@ echo "########################################################################## echo "#################################### Netplay.sh script start.######################################################" echo "###################################################################################################################" LD_PRELOAD=/mnt/SDCARD/miyoo/lib/libpadsp.so prompt -t "Netplay" \ - "Host" \ - "Join" + "Host a session..." \ + "Join a session..." retcode=$? if [ $retcode -eq 0 ]; then @@ -114,10 +114,10 @@ elif [ $retcode -eq 255 ]; then fi if [ "$romdirname" == "GB" ] || [ "$romdirname" == "GBC" ]; then - echo -e "tgbdual_single_screen_mp = \"player 1 only\"" >"$tgb_dual_opts_tmp" - echo -e "tgbdual_audio_output = \"Game Boy #1\"" >>"$tgb_dual_opts_tmp" - $sysdir/script/patch_ra_cfg.sh "$tgb_dual_opts_tmp" "$tgb_dual_opts" - rm "$tgb_dual_opts_tmp" + echo -e "tgbdual_single_screen_mp = \"player 1 only\"" > "$tgb_dual_opts_tmp" + echo -e "tgbdual_audio_output = \"Game Boy #1\"" >> "$tgb_dual_opts_tmp" + $sysdir/script/patch_ra_cfg.sh "$tgb_dual_opts_tmp" "$tgb_dual_opts" + rm "$tgb_dual_opts_tmp" fi echo "###################################################################################################################" @@ -128,10 +128,3 @@ echo "########################################################################## if [ -f "/tmp/old_ipv4.txt" ]; then "$sysdir/script/network/hotspot_cleanup.sh" fi - - - - - - -