Skip to content

Commit 2a762e6

Browse files
icenine451icenine451
committed
Remove reduncant symlinks and reference paths directly in RA config, disable currently broken prepare commands [skip ci]
1 parent 2b6b0a1 commit 2a762e6

1 file changed

Lines changed: 33 additions & 22 deletions

File tree

‎retroarch/component_prepare.sh‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
1111
log i "--------------------------------"
1212

1313
create_dir -d "$XDG_CONFIG_HOME/retroarch"
14-
dir_prep "$bios_path" "$XDG_CONFIG_HOME/retroarch/system"
1514
dir_prep "$logs_path/retroarch" "$XDG_CONFIG_HOME/retroarch/logs"
1615
if [[ -d "$cheats_path/retroarch" && "$(ls -A "$cheats_path/retroarch")" ]]; then
1716
backup_file="$backups_path/cheats/retroarch-$(date +%y%m%d).tar.gz"
@@ -38,6 +37,11 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
3837
set_setting_value "$retroarch_config" "content_database_path" "$component_path/database/rdb" "retroarch"
3938
set_setting_value "$retroarch_config" "libretro_directory" "$retroarch_extras_path/cores" "retroarch"
4039
set_setting_value "$retroarch_config" "libretro_info_path" "$retroarch_extras_path/cores" "retroarch"
40+
set_setting_value "$retroarch_config" "audio_filter_dir" "$shaders_path/retroarch/filters/audio" "retroarch"
41+
set_setting_value "$retroarch_config" "video_filter_dir" "$shaders_path/retroarch/filters/video" "retroarch"
42+
set_setting_value "$retroarch_config" "video_shader_dir" "$shaders_path/retroarch/shaders" "retroarch"
43+
set_setting_value "$retroarch_config" "overlay_directory" "$borders_path/retroarch" "retroarch"
44+
set_setting_value "$retroarch_config" "system_directory" "$bios_path" "retroarch"
4145

4246
# Video
4347
create_dir "$videos_path/retroarch"
@@ -71,9 +75,6 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
7175
retroarch_updater
7276

7377
# Avoid these paths being clobbered by the updater
74-
dir_prep "$borders_path/retroarch/" "$XDG_CONFIG_HOME/retroarch/overlays/borders"
75-
log d "Linking shaders folder to ensure retroarch can find it $XDG_CONFIG_HOME/retroarch/shaders to $shaders_path/retroarch"
76-
dir_prep "$shaders_path/retroarch" "$XDG_CONFIG_HOME/retroarch/shaders"
7778
ln -s "$retroarch_extras_path/cores" "$XDG_CONFIG_HOME/retroarch/cores" # Link RO cores to RA config dir so ES-DE can find it
7879

7980
# FBNEO
@@ -124,17 +125,17 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
124125
set_setting_value "$retroarch_config_scummvm" "browser_lastpath" "$roms_path/scummvm" "libretro_scummvm" "scummvm"
125126

126127
# Texture Packs
127-
dir_prep "$texture_packs_path/retroarch-core/Mesen/HdPacks" "$XDG_CONFIG_HOME/retroarch/system/HdPacks"
128-
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/cache" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/cache"
129-
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/hires_texture" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/hires_texture"
130-
dir_prep "$texture_packs_path/retroarch-core/Citra/textures" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/textures"
131-
dir_prep "$texture_packs_path/retroarch-core/Dolphin/Textures" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/Textures/"
132-
dir_prep "$texture_packs_path/retroarch-core/PPSSPP/TEXTURES" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/TEXTURES"
128+
dir_prep "$texture_packs_path/retroarch-core/Mesen/HdPacks" "$bios_path/HdPacks"
129+
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/cache" "$bios_path/Mupen64plus/cache"
130+
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/hires_texture" "$bios_path/Mupen64plus/hires_texture"
131+
# dir_prep "$texture_packs_path/retroarch-core/Citra/textures" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/textures"
132+
# dir_prep "$texture_packs_path/retroarch-core/Dolphin/Textures" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/Textures/"
133+
# dir_prep "$texture_packs_path/retroarch-core/PPSSPP/TEXTURES" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/TEXTURES"
133134
dir_prep "$texture_packs_path/retroarch-core/Flycast/textures" "$bios_path/dc/textures"
134135

135136
# Mods
136-
dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods"
137-
dir_prep "$mods_path/retroarch-core/Dolphin/GraphicMods" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/GraphicMods"
137+
# dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods"
138+
# dir_prep "$mods_path/retroarch-core/Dolphin/GraphicMods" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/GraphicMods"
138139
fi
139140

140141
if [[ "$action" == "postmove" ]]; then # Run only post-move commands
@@ -150,30 +151,30 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands
150151
set_setting_value "$retroarch_config_scummvm" "browser_lastpath" "$roms_path/scummvm" "libretro_scummvm" "scummvm"
151152

152153
# BIOS
153-
dir_prep "$bios_path" "$XDG_CONFIG_HOME/retroarch/system"
154+
set_setting_value "$retroarch_config" "system_directory" "$bios_path" "retroarch"
154155

155156
# Logs
156157
dir_prep "$logs_path/retroarch" "$XDG_CONFIG_HOME/retroarch/logs"
157158

158159
# Texture Packs
159-
dir_prep "$texture_packs_path/retroarch-core/Mesen/HdPacks" "$XDG_CONFIG_HOME/retroarch/system/HdPacks"
160-
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/cache" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/cache"
161-
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/hires_texture" "$XDG_CONFIG_HOME/retroarch/system/Mupen64plus/hires_texture"
162-
dir_prep "$texture_packs_path/retroarch-core/Citra/textures" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/textures"
163-
dir_prep "$texture_packs_path/retroarch-core/Dolphin/Textures" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/Textures/"
164-
dir_prep "$texture_packs_path/retroarch-core/PPSSPP/TEXTURES" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/TEXTURES"
160+
dir_prep "$texture_packs_path/retroarch-core/Mesen/HdPacks" "$bios_path/HdPacks"
161+
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/cache" "$bios_path/Mupen64plus/cache"
162+
dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/hires_texture" "$bios_path/Mupen64plus/hires_texture"
163+
# dir_prep "$texture_packs_path/retroarch-core/Citra/textures" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/textures"
164+
# dir_prep "$texture_packs_path/retroarch-core/Dolphin/Textures" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/Textures/"
165+
# dir_prep "$texture_packs_path/retroarch-core/PPSSPP/TEXTURES" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/TEXTURES"
165166
dir_prep "$texture_packs_path/retroarch-core/Flycast/textures" "$bios_path/dc/textures"
166167

167168
# Cheats
168169
dir_prep "$cheats_path/retroarch-core/fbneo" "$bios_path/fbneo/cheats"
169170

170171
# Shaders
171172
dir_prep "$shaders_path/retroarch-core/fbneo/blend" "$bios_path/fbneo/blend"
172-
dir_prep "$shaders_path/retroarch" "$XDG_CONFIG_HOME/retroarch/shaders"
173+
# dir_prep "$shaders_path/retroarch/shaders" "$XDG_CONFIG_HOME/retroarch/shaders"
173174

174175
# Mods
175-
dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods"
176-
dir_prep "$mods_path/retroarch-core/Dolphin/GraphicMods" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/GraphicMods"
176+
# dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods"
177+
# dir_prep "$mods_path/retroarch-core/Dolphin/GraphicMods" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/GraphicMods"
177178
dir_prep "$mods_path/retroarch-core/fbneo/patched" "$bios_path/fbneo/patched"
178179
dir_prep "$mods_path/retroarch-core/fbneo/ips" "$bios_path/fbneo/ips"
179180
dir_prep "$mods_path/retroarch-core/fbneo/romdata" "$bios_path/fbneo/romdata"
@@ -186,4 +187,14 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands
186187
set_setting_value "$retroarch_config" "log_dir" "$logs_path" "retroarch"
187188
set_setting_value "$retroarch_config" "rgui_browser_directory" "$roms_path" "retroarch"
188189
set_setting_value "$retroarch_config" "cheat_database_path" "$cheats_path/retroarch" "retroarch"
190+
set_setting_value "$retroarch_config" "assets_directory" "$component_path/assets" "retroarch"
191+
set_setting_value "$retroarch_config" "joypad_autoconfig_dir" "$component_path/autoconfig" "retroarch"
192+
set_setting_value "$retroarch_config" "cursor_directory" "$component_path/database/cursors" "retroarch"
193+
set_setting_value "$retroarch_config" "content_database_path" "$component_path/database/rdb" "retroarch"
194+
set_setting_value "$retroarch_config" "libretro_directory" "$retroarch_extras_path/cores" "retroarch"
195+
set_setting_value "$retroarch_config" "libretro_info_path" "$retroarch_extras_path/cores" "retroarch"
196+
set_setting_value "$retroarch_config" "audio_filter_dir" "$shaders_path/retroarch/filters/audio" "retroarch"
197+
set_setting_value "$retroarch_config" "video_filter_dir" "$shaders_path/retroarch/filters/video" "retroarch"
198+
set_setting_value "$retroarch_config" "video_shader_dir" "$shaders_path/retroarch/shaders" "retroarch"
199+
set_setting_value "$retroarch_config" "overlay_directory" "$borders_path/retroarch" "retroarch"
189200
fi

0 commit comments

Comments
 (0)