From 0d078cb88aaa875618756416a06027be5a95dd44 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 14 Apr 2023 09:10:52 -0400 Subject: [PATCH 1/4] Fix network checks. --- functions.sh | 10 +++++----- retrodeck.sh | 4 ++-- tools/configurator.sh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/functions.sh b/functions.sh index a2c29c27..2f843e24 100644 --- a/functions.sh +++ b/functions.sh @@ -710,7 +710,7 @@ done < $1 check_network_connectivity() { # This function will do a basic check for network availability and return "true" if it is working. - # USAGE: if [[ check_network_connectivity == "true" ]]; then + # USAGE: if [[ $(check_network_connectivity) == "true" ]]; then wget -q --spider $rd_repo @@ -1550,7 +1550,7 @@ cli_emulator_reset() { case $1 in "retroarch" ) - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then ra_init else printf "You do not appear to be connected to a network with internet access.\n\nThe RetroArch reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available.\n" @@ -1584,7 +1584,7 @@ cli_emulator_reset() { rpcs3_init ;; "xemu" ) - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then xemu_init else printf "You do not appear to be connected to a network with internet access.\n\nThe Xemu reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available.\n" @@ -1594,7 +1594,7 @@ cli_emulator_reset() { yuzu_init ;; "all-emulators" ) - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then ra_init standalones_init else @@ -2193,4 +2193,4 @@ configurator_reset_confirmation_dialog() { else echo "false" fi -} \ No newline at end of file +} diff --git a/retrodeck.sh b/retrodeck.sh index df9f9f88..6bc50171 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -135,7 +135,7 @@ then # if the lock file doesn't exist at all means that it's a fresh install or a triggered reset else echo "Lockfile not found" - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then finit # Executing First/Force init else configurator_generic_dialog "You do not appear to be connected to a network with internet access.\n\nThe initial RetroDECK setup requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available." @@ -152,7 +152,7 @@ fi desktop_mode_warning # Check if there is a new version of RetroDECK available, if update_check=true in retrodeck.cfg and there is network connectivity available. -if [[ check_network_connectivity == "true" ]] && [[ $update_check == "true" ]]; then +if [[ $(check_network_connectivity) == "true" ]] && [[ $update_check == "true" ]]; then check_for_version_update fi diff --git a/tools/configurator.sh b/tools/configurator.sh index 2fd5547f..c0530ef4 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -88,7 +88,7 @@ configurator_reset_dialog() { "RetroArch" ) if [[ $(configurator_reset_confirmation_dialog "RetroArch" "Are you sure you want to reset the RetroArch emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then ra_init configurator_process_complete_dialog "resetting $emulator_to_reset" else @@ -193,7 +193,7 @@ configurator_reset_dialog() { "XEMU" ) if [[ $(configurator_reset_confirmation_dialog "XEMU" "Are you sure you want to reset the XEMU emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then xemu_init configurator_process_complete_dialog "resetting $emulator_to_reset" else @@ -225,7 +225,7 @@ configurator_reset_dialog() { "Reset All Emulators" ) if [[ $(configurator_reset_confirmation_dialog "all emulators" "Are you sure you want to reset all emulators to default settings?\n\nThis process cannot be undone.") == "true" ]]; then - if [[ check_network_connectivity == "true" ]]; then + if [[ $(check_network_connectivity) == "true" ]]; then ra_init standalones_init configurator_process_complete_dialog "resetting all emulators" @@ -1197,4 +1197,4 @@ configurator_welcome_dialog() { # START THE CONFIGURATOR -configurator_welcome_dialog \ No newline at end of file +configurator_welcome_dialog From a761e3987fce028b6963f57c366fc0c9f6641402 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 14 Apr 2023 11:07:41 -0400 Subject: [PATCH 2/4] Add ES-DE startup bar color change --- .../es-de/es-de-retrodeck-mods.patch | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index 6ff1e475..f5f49bbd 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,12 +1,12 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-patched/es-app/src/guis/GuiMenu.cpp +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp --- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de-patched/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:18:59.249278398 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400 @@ -10,2 +10,3 @@ #include "guis/GuiMenu.h" +#include "utils/PlatformUtil.h" - + @@ -66,2 +67,4 @@ - + + addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && @@ -21,7 +21,7 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p + addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); #endif @@ -1704,2 +1707,15 @@ - + +void GuiMenu::openRetroDeckConfigurator() +{ + // Launch the configurator.sh script @@ -41,10 +41,18 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p - auto quitText = std::make_shared("QUIT EMULATIONSTATION", + auto quitText = std::make_shared("QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), 0x777777FF); -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de-patched/es-app/src/guis/GuiMenu.h +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h --- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de-patched/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 @@ -46,2 +46,3 @@ void openOtherOptions(); + void openRetroDeckConfigurator(); void openQuitMenu(); +diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp +--- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400 ++++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 +@@ -179,3 +179,3 @@ + progressBarRect.barPosY += borderThickness; +- progressBarRect.color = 0x79010FFF; ++ progressBarRect.color = 0xC858E6FF; + mProgressBarRectangles.emplace_back(progressBarRect); From 6d7aef7b37a96937b3d994d0d98426cc6196ffc7 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 14 Apr 2023 16:55:50 -0400 Subject: [PATCH 3/4] Add Vita3K to SHA hash automation --- automation_tools/sha_update_list.cfg | 1 + net.retrodeck.retrodeck.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/automation_tools/sha_update_list.cfg b/automation_tools/sha_update_list.cfg index 7cbb4f75..e4d06b35 100644 --- a/automation_tools/sha_update_list.cfg +++ b/automation_tools/sha_update_list.cfg @@ -1,3 +1,4 @@ # The proper format for this file is # URL^PLACEHOLDERTEXT https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip^DOOMSHAPLACEHOLDER +https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip^VITASHAPLACEHOLDER diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c811d7f7..a70c7305 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1173,8 +1173,8 @@ modules: ln -s ${FLATPAK_DEST}/vita3k/Vita3K /app/bin/Vita3K sources: - type: archive - url: https://github.com/XargonWan/RetroDECK/raw/cooker-0.7.0b/rd-submodules/vita3k/vita3k-14-01-23.zip - sha256: f814fa5efba6037cef629f7a796dec7ee3d5b9808532230a93b1b8c42981b53b + url: https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip + sha256: VITASHAPLACEHOLDER # Vita3K - END From ec123bb346988774560bb268251a19f35738b5ef Mon Sep 17 00:00:00 2001 From: icenine451 <59938822+icenine451@users.noreply.github.com> Date: Sun, 16 Apr 2023 12:35:50 -0400 Subject: [PATCH 4/4] PICO-8 binary wrapper --- emu-configs/pico-8/pico8-wrapper.sh | 6 ++++++ net.retrodeck.retrodeck.yml | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 emu-configs/pico-8/pico8-wrapper.sh diff --git a/emu-configs/pico-8/pico8-wrapper.sh b/emu-configs/pico-8/pico8-wrapper.sh new file mode 100644 index 00000000..7581e17f --- /dev/null +++ b/emu-configs/pico-8/pico8-wrapper.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# This is a wrapper function for PICO8, as ES-DE does not appear to be able to find it outside of the /app/bin location. +# Users should still put the real binary in the ~/retrodeck/bios/pico-8/ location + +~/retrodeck/bios/pico-8/pico8 diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a70c7305..e933f82b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1226,8 +1226,9 @@ modules: # Initializing default emulator configs - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/ - # Overlays - #- cp -r overlays ${FLATPAK_DEST}/retrodeck/overlays Disabled in 0.4.2b as it will be introduced in 0.5.0b + # PICO-8 wrapper + - cp ${FLATPAK_DEST}/retrodeck/emu-configs/pico-8/pico8-wrapper.sh /app/bin/pico8 + - chmod +x /app/bin/pico8 # Placing appdata - mkdir -p ${FLATPAK_DEST}/share/appdata