From a67e9c0d1c70fc619f36e725aede55524bdcdb8f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 4 Jan 2024 08:25:59 +0100 Subject: [PATCH] FRAMEWORK: unhidden logs folder --- emu-configs/PCSX2/PCSX2_ui.ini | 2 +- emu-configs/defaults/retrodeck/retrodeck.cfg | 2 +- emu-configs/gzdoom/gzdoom.sh | 2 +- functions/050_save_migration.sh | 4 ++-- functions/prepare_emulator.sh | 2 +- tools/configurator.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/emu-configs/PCSX2/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini index 8f9a5a8d..d7ba5375 100644 --- a/emu-configs/PCSX2/PCSX2_ui.ini +++ b/emu-configs/PCSX2/PCSX2_ui.ini @@ -44,7 +44,7 @@ Bios=RETRODECKHOMEDIR/roms/bios Snapshots=RETRODECKHOMEDIR/screenshots Savestates=RETRODECKHOMEDIR/states/ps2/pcsx2 MemoryCards=RETRODECKHOMEDIR/saves/ps2/memcards -Logs=RETRODECKHOMEDIR/.logs +Logs=RETRODECKHOMEDIR/logs Langs=/app/share/PCSX2/resources/locale Cheats=/var/config/PCSX2/cheats CheatsWS=/var/config/PCSX2/cheats_ws diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg index adf10001..cf88db79 100644 --- a/emu-configs/defaults/retrodeck/retrodeck.cfg +++ b/emu-configs/defaults/retrodeck/retrodeck.cfg @@ -8,7 +8,7 @@ states_folder=/home/deck/retrodeck/states bios_folder=/home/deck/retrodeck/bios media_folder=/home/deck/retrodeck/downloaded_media themes_folder=/home/deck/retrodeck/themes -logs_folder=/home/deck/retrodeck/.logs +logs_folder=/home/deck/retrodeck/logs screenshots_folder=/home/deck/retrodeck/screenshots mods_folder=/home/deck/retrodeck/mods texture_packs_folder=/home/deck/retrodeck/texture_packs diff --git a/emu-configs/gzdoom/gzdoom.sh b/emu-configs/gzdoom/gzdoom.sh index ec9f5aa7..dda22916 100644 --- a/emu-configs/gzdoom/gzdoom.sh +++ b/emu-configs/gzdoom/gzdoom.sh @@ -11,7 +11,7 @@ IWAD_FILES=("DOOM1.WAD" "DOOM.WAD" "DOOM2.WAD" "DOOM2F.WAD" "DOOM64.WAD" "TNT.WA # Function to log messages to terminal and a log file log() { local message="$1" - local logfile="$rdhome/.logs/gzdoom.log" + local logfile="$rdhome/logs/gzdoom.log" local timestamp="$(date +[%Y-%m-%d\ %H:%M:%S])" echo "$timestamp $message" | tee -a "$logfile" diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index f0187e24..0f53c65c 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -30,7 +30,7 @@ save_migration() { # Doing the dir prep as we don't know from which version we came dir_prep "$media_folder" "/var/config/emulationstation/.emulationstation/downloaded_media" dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes" - mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions + mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml @@ -50,7 +50,7 @@ save_migration() { versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves if [[ $(sed -e "s/\.//g" <<< $hard_version) > $(sed -e "s/\.//g" <<< $versionwheresaveschanged) ]] && [[ ! $(sed -e "s/\.//g" <<< $version) > $(sed -e "s/\.//g" <<< $versionwheresaveschanged) ]]; then # Check if user is upgrading from the version where save organization was changed. Try not to reuse this, it things 0.4.5b is newer than 0.4.5 - migration_logfile=$rdhome/.logs/savemove_"$(date +"%Y_%m_%d_%I_%M_%p").log" + migration_logfile=$rdhome/logs/savemove_"$(date +"%Y_%m_%d_%I_%M_%p").log" save_backup_file=$rdhome/savebackup_"$(date +"%Y_%m_%d_%I_%M_%p").zip" state_backup_file=$rdhome/statesbackup_"$(date +"%Y_%m_%d_%I_%M_%p").zip" diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index d3952f80..1ce4cd8d 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -220,7 +220,7 @@ prepare_emulator() { fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata" - dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log" + dir_prep "$rdhome/logs/citra" "/var/data/citra-emu/log" dir_prep "$mods_folder/Citra" "/var/data/citra-emu/load/mods" dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures" set_setting_value "$citraconf" "nand_directory" "$saves_folder/n3ds/citra/nand/" "citra" "Data%20Storage" diff --git a/tools/configurator.sh b/tools/configurator.sh index 81e2b8e6..659ac0f4 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -973,7 +973,7 @@ configurator_check_multifile_game_structure() { zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Check & Verify: Multi-file structure" \ - --text="The following games were found to have the incorrect folder structure:\n\n$(find $roms_folder -maxdepth 2 -mindepth 2 -type d ! -name "*.m3u" ! -name "*.ps3")\n\nIncorrect folder structure can result in failure to launch games or saves being in the incorrect location.\n\nPlease see the RetroDECK wiki for more details!\n\nYou can find this list of games in ~/retrodeck/.logs" + --text="The following games were found to have the incorrect folder structure:\n\n$(find $roms_folder -maxdepth 2 -mindepth 2 -type d ! -name "*.m3u" ! -name "*.ps3")\n\nIncorrect folder structure can result in failure to launch games or saves being in the incorrect location.\n\nPlease see the RetroDECK wiki for more details!\n\nYou can find this list of games in ~/retrodeck/logs" else configurator_generic_dialog "RetroDECK Configurator - Check & Verify: Multi-file structure" "No incorrect multi-file game folder structures found." fi