Merge pull request #781 from icenine451/cooker-0.8.1b-icenine451

RPCS3 Framework additions
This commit is contained in:
icenine451 2024-05-03 09:14:56 -04:00 committed by GitHub
commit b99457cb2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 15 deletions

View file

@ -82,3 +82,4 @@ duckstation=false
pcsx2=false pcsx2=false
primehack=false primehack=false
citra=false citra=false
rpcs3=false

View file

@ -47,5 +47,5 @@ main_window_stop=Ctrl+Q
main_window_toggle_fullscreen=Ctrl+Return main_window_toggle_fullscreen=Ctrl+Return
[main_window] [main_window]
confirmationBoxExitGame=true confirmationBoxExitGame=false
infoBoxEnabledWelcome=false infoBoxEnabledWelcome=false

View file

@ -39,11 +39,21 @@ set_setting_value() {
fi fi
;; ;;
"rpcs3" | "vita3k" ) # This does not currently work for settings with a $ in them "rpcs3" | "vita3k" )
if [[ -z $current_section_name ]]; then # This does not currently work for settings with a $ in them
sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1"
else if [[ "$1" =~ (.ini)$ ]]; then # If this is a RPCS3 .ini file
sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1" if [[ -z $current_section_name ]]; then
sed -i 's^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' "$1"
else
sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'=^s^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' "$1"
fi
elif [[ "$1" =~ (.yml)$ ]]; then # If this is an YML-based file
if [[ -z $current_section_name ]]; then
sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1"
else
sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1"
fi
fi fi
;; ;;
@ -55,7 +65,9 @@ set_setting_value() {
fi fi
;; ;;
"mame" ) # In this option, $current_section_name is the <system name> in the .cfg file. "mame" )
# In this option, $current_section_name is the <system name> in the .cfg file.
local mame_current_value=$(get_setting_value "$1" "$setting_name_to_change" "$4" "$current_section_name") local mame_current_value=$(get_setting_value "$1" "$setting_name_to_change" "$4" "$current_section_name")
if [[ "$1" =~ (.ini)$ ]]; then # If this is a MAME .ini file if [[ "$1" =~ (.ini)$ ]]; then # If this is a MAME .ini file
sed -i '\^\^'"$setting_name_to_change"'\s^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1" sed -i '\^\^'"$setting_name_to_change"'\s^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1"
@ -84,7 +96,11 @@ get_setting_name() {
;; ;;
"rpcs3" | "vita3k" ) "rpcs3" | "vita3k" )
echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?:\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g' if [[ "$1" =~ (.ini)$ ]]; then # If this is a RPCS3 .ini file
echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?=\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g;s^\\$^^'
elif [[ "$1" =~ (.yml)$ ]]; then # If this is an YML-based file
echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?:\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g'
fi
;; ;;
"mame" ) # This only works for mame .ini files, not the .cfg XML files "mame" ) # This only works for mame .ini files, not the .cfg XML files

View file

@ -183,12 +183,6 @@ if [[ $update_check == "true" ]]; then
log i "You're running the latest version" log i "You're running the latest version"
fi fi
# THIS IS A ONE-OFF FORCED REFRESH OF RETRODECK CONTROLLER PROFILES IN A 0.7.6b VERSION REFRESH - REMOVE BEFORE NEXT VERSION RELEASE
if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed
install_retrodeck_controller_profile
fi
# REMOVE BEFORE NEXT VERSION RELEASE
# Normal Startup # Normal Startup
if [[ $steam_sync == "true" ]]; then if [[ $steam_sync == "true" ]]; then