ra borders folder

Author: Lazorne

retroarch/component_prepare.sh

@@ -47,7 +47,7 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
   retroarch_updater
 
   # Avoid these paths being clobbered by the updater
-  dir_prep "$borders_path" "$XDG_CONFIG_HOME/retroarch/overlays/borders"
+  dir_prep "$borders_path/retroarch/" "$XDG_CONFIG_HOME/retroarch/overlays/borders"
   log d "Linking shaders folder to ensure retroarch can find it $XDG_CONFIG_HOME/retroarch/shaders to $shaders_path/retroarch"
   dir_prep "$shaders_path/retroarch" "$XDG_CONFIG_HOME/retroarch/shaders"
   ln -s "$retroarch_extras_path/cores" "$XDG_CONFIG_HOME/retroarch/cores" # Link RO cores to RA config dir so ES-DE can find it

retroarch/component_update.sh

@@ -11,11 +11,11 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.7.0b") == "true"
   # - Add shipped Amiga bios if it doesn't already exist
   # - Disable auto-save/load in existing RA / PCSX2 / Duckstation installs for proper preset functionality
 
-  dir_prep "$texture_packs_folder/RetroArch-Mesen" "$XDG_CONFIG_HOME/retroarch/system/HdPacks"
-  dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/cache"
-  dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/hires_texture"
+  dir_prep "$texture_packs_path/retroarch/Mesen/HdPacks" "$XDG_CONFIG_HOME/retroarch/system/HdPacks"
+  dir_prep "$texture_packs_path/retroarch/Mupen64Plus/cache" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/cache"
+  dir_prep "$texture_packs_path/retroarch/Mupen64Plus/hires_texture" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/hires_texture"
 
-  dir_prep "$borders_folder" "$XDG_CONFIG_HOME/retroarch/overlays/borders"
+  dir_prep "$borders_path/retroarch/" "$XDG_CONFIG_HOME/retroarch/overlays/borders"
   rsync -rlD --mkpath "/app/retrodeck/config/retroarch/borders/" "$XDG_CONFIG_HOME/retroarch/overlays/borders/"
 
   rsync -rlD --mkpath "$config/retrodeck/presets/remaps/" "$XDG_CONFIG_HOME/retroarch/config/remaps/"
@@ -39,12 +39,12 @@ fi
 if [[ $(check_version_is_older_than "$version_being_updated" "0.8.1b") == "true" ]]; then
   log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:"
 
-  log i "Installing the missing ScummVM assets and renaming \"$mods_folder/RetroArch/ScummVM/themes\" into \"theme\""
-  mv -f "$mods_folder/RetroArch/ScummVM/themes" "$mods_folder/RetroArch/ScummVM/theme"
+  log i "Installing the missing ScummVM assets and renaming \"$storage_path/retroarch/ScummVM/themes\" into \"theme\""
+  mv -f "$storage_path/retroarch/ScummVM/themes" "$s/retroarch/ScummVM/themes"
   unzip -o "$config/retroarch/ScummVM.zip" 'scummvm/extra/*' -d /tmp
   unzip -o "$config/retroarch/ScummVM.zip" 'scummvm/theme/*' -d /tmp
-  mv -f "/tmp/scummvm/extra" "$mods_folder/RetroArch/ScummVM"
-  mv -f "/tmp/scummvm/theme" "$mods_folder/RetroArch/ScummVM"
+  mv -f "/tmp/scummvm/extra" "$storage_path/retroarch/ScummVM/extra"
+  mv -f "/tmp/scummvm/theme" "$storage_path/retroarch/ScummVM/theme"
   rm -rf "/tmp/extra /tmp/theme"
 fi