mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-21 21:45:39 +00:00
Add comment and blank line handling to reference-file-reading functions
This commit is contained in:
icenine451
parent
88893a3c1b
commit
2e44842458
|
|
@ -158,9 +158,11 @@ check_for_version_update() {
|
|||
validate_input() {
|
||||
while IFS="^" read -r input action || [[ -n "$input" ]];
|
||||
do
|
||||
if [[ "$input" == "$1" ]]; then
|
||||
eval "$action"
|
||||
input_validated="true"
|
||||
if [[ ! $input == "#"* ]] && [[ ! -z "$input" ]]; then
|
||||
if [[ "$input" == "$1" ]]; then
|
||||
eval "$action"
|
||||
input_validated="true"
|
||||
fi
|
||||
fi
|
||||
done < $input_validation
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,22 +12,24 @@ check_bios_files() {
|
|||
|
||||
while IFS="^" read -r bios_file bios_subdir bios_hash bios_system bios_desc || [[ -n "$bios_file" ]];
|
||||
do
|
||||
bios_file_found="No"
|
||||
bios_hash_matched="No"
|
||||
if [[ -f "$bios_folder/$bios_subdir$bios_file" ]]; then
|
||||
bios_file_found="Yes"
|
||||
if [[ $bios_hash == "Unknown" ]]; then
|
||||
bios_hash_matched="Unknown"
|
||||
elif [[ $(md5sum "$bios_folder/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then
|
||||
bios_hash_matched="Yes"
|
||||
if [[ ! $bios_file == "#"* ]] && [[ ! -z "$bios_file" ]]; then
|
||||
bios_file_found="No"
|
||||
bios_hash_matched="No"
|
||||
if [[ -f "$bios_folder/$bios_subdir$bios_file" ]]; then
|
||||
bios_file_found="Yes"
|
||||
if [[ $bios_hash == "Unknown" ]]; then
|
||||
bios_hash_matched="Unknown"
|
||||
elif [[ $(md5sum "$bios_folder/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then
|
||||
bios_hash_matched="Yes"
|
||||
fi
|
||||
fi
|
||||
if [[ "$1" == "basic" ]]; then
|
||||
bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
|
||||
echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file
|
||||
else
|
||||
bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc" "$bios_subdir" "$bios_hash")
|
||||
echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" >> "$godot_bios_files_checked" # Godot data transfer temp file
|
||||
fi
|
||||
fi
|
||||
if [[ "$1" == "basic" ]]; then
|
||||
bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
|
||||
echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file
|
||||
else
|
||||
bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc" "$bios_subdir" "$bios_hash")
|
||||
echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" >> "$godot_bios_files_checked" # Godot data transfer temp file
|
||||
fi
|
||||
done < $bios_checklist
|
||||
}
|
||||
|
|
|
|||
|
|
@ -412,45 +412,42 @@ cp -fv "$1" "$3" # Create a copy of the original file to be patched
|
|||
|
||||
while IFS="^" read -r action current_section setting_name setting_value system_name || [[ -n "$action" ]];
|
||||
do
|
||||
if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then
|
||||
case $action in
|
||||
|
||||
case $action in
|
||||
"disable_file" )
|
||||
eval disable_file "$setting_name"
|
||||
;;
|
||||
|
||||
"disable_file" )
|
||||
eval disable_file "$setting_name"
|
||||
;;
|
||||
"enable_file" )
|
||||
eval enable_file "$setting_name"
|
||||
;;
|
||||
|
||||
"enable_file" )
|
||||
eval enable_file "$setting_name"
|
||||
;;
|
||||
"add_setting_line" )
|
||||
add_setting_line "$3" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"add_setting_line" )
|
||||
add_setting_line "$3" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
"disable_setting" )
|
||||
disable_setting "$3" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"disable_setting" )
|
||||
disable_setting "$3" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
"enable_setting" )
|
||||
enable_setting "$3" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"enable_setting" )
|
||||
enable_setting "$3" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
"change" )
|
||||
if [[ "$setting_value" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval setting_value="$setting_value"
|
||||
fi
|
||||
set_setting_value "$3" "$setting_name" "$setting_value" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"change" )
|
||||
if [[ "$setting_value" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval setting_value="$setting_value"
|
||||
fi
|
||||
set_setting_value "$3" "$setting_name" "$setting_value" "$system_name" "$current_section"
|
||||
;;
|
||||
* )
|
||||
log e "Config line malformed: $action"
|
||||
;;
|
||||
|
||||
*"#"* )
|
||||
# Comment line in patch file
|
||||
;;
|
||||
|
||||
* )
|
||||
echo "Config line malformed: $action"
|
||||
;;
|
||||
|
||||
esac
|
||||
esac
|
||||
fi
|
||||
done < "$2"
|
||||
}
|
||||
|
||||
|
|
@ -463,58 +460,56 @@ deploy_multi_patch() {
|
|||
|
||||
while IFS="^" read -r action current_section setting_name setting_value system_name config_file || [[ -n "$action" ]];
|
||||
do
|
||||
case $action in
|
||||
if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then
|
||||
case $action in
|
||||
|
||||
"disable_file" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
disable_file "$config_file"
|
||||
;;
|
||||
"disable_file" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
disable_file "$config_file"
|
||||
;;
|
||||
|
||||
"enable_file" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
enable_file "$config_file"
|
||||
;;
|
||||
"enable_file" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
enable_file "$config_file"
|
||||
;;
|
||||
|
||||
"add_setting_line" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
add_setting_line "$config_file" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
"add_setting_line" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
add_setting_line "$config_file" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"disable_setting" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
disable_setting "$config_file" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
"disable_setting" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
disable_setting "$config_file" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"enable_setting" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
enable_setting "$config_file" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
"enable_setting" )
|
||||
if [[ "$config_file" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval config_file="$config_file"
|
||||
fi
|
||||
enable_setting "$config_file" "$setting_name" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
"change" )
|
||||
if [[ "$setting_value" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval setting_value="$setting_value"
|
||||
fi
|
||||
set_setting_value "$config_file" "$setting_name" "$setting_value" "$system_name" "$current_section"
|
||||
;;
|
||||
"change" )
|
||||
if [[ "$setting_value" = \$* ]]; then # If patch setting value is a reference to an internal variable name
|
||||
eval setting_value="$setting_value"
|
||||
fi
|
||||
set_setting_value "$config_file" "$setting_name" "$setting_value" "$system_name" "$current_section"
|
||||
;;
|
||||
|
||||
*"#"* )
|
||||
# Comment line in patch file
|
||||
;;
|
||||
* )
|
||||
log e "Config line malformed: $action"
|
||||
;;
|
||||
|
||||
* )
|
||||
echo "Config line malformed: $action"
|
||||
;;
|
||||
|
||||
esac
|
||||
esac
|
||||
fi
|
||||
done < "$1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -363,7 +363,9 @@ finit_user_options_dialog() {
|
|||
|
||||
while IFS="^" read -r enabled option_name option_desc option_tag || [[ -n "$enabled" ]];
|
||||
do
|
||||
finit_available_options=("${finit_available_options[@]}" "$enabled" "$option_name" "$option_desc" "$option_tag")
|
||||
if [[ ! $enabled == "#"* ]] && [[ ! -z "$enabled" ]]; then
|
||||
finit_available_options=("${finit_available_options[@]}" "$enabled" "$option_name" "$option_desc" "$option_tag")
|
||||
fi
|
||||
done < $finit_options_list
|
||||
|
||||
|
||||
|
|
@ -581,11 +583,13 @@ easter_eggs() {
|
|||
if [[ ! -z $(cat $easter_egg_checklist) ]]; then
|
||||
while IFS="^" read -r start_date end_date start_time end_time splash_file || [[ -n "$start_date" ]]; # Read Easter Egg checklist file and separate values
|
||||
do
|
||||
if [[ "$((10#$current_day))" -ge "$((10#$start_date))" && "$((10#$current_day))" -le "$((10#$end_date))" && "$((10#$current_time))" -ge "$((10#$start_time))" && "$((10#$current_time))" -le "$((10#$end_time))" ]]; then # If current line specified date/time matches current date/time, set $splash_file to be deployed
|
||||
new_splash_file="$splashscreen_dir/$splash_file"
|
||||
break
|
||||
else # When there are no matches, the default splash screen is set to deploy
|
||||
new_splash_file="$default_splash_file"
|
||||
if [[ ! $start_date == "#"* ]] && [[ ! -z "$start_date" ]]; then
|
||||
if [[ "$((10#$current_day))" -ge "$((10#$start_date))" && "$((10#$current_day))" -le "$((10#$end_date))" && "$((10#$current_time))" -ge "$((10#$start_time))" && "$((10#$current_time))" -le "$((10#$end_time))" ]]; then # If current line specified date/time matches current date/time, set $splash_file to be deployed
|
||||
new_splash_file="$splashscreen_dir/$splash_file"
|
||||
break
|
||||
else # When there are no matches, the default splash screen is set to deploy
|
||||
new_splash_file="$default_splash_file"
|
||||
fi
|
||||
fi
|
||||
done < $easter_egg_checklist
|
||||
else
|
||||
|
|
|
|||
|
|
@ -79,11 +79,14 @@ make_preset_changes() {
|
|||
fi
|
||||
set_setting_value "$rd_conf" "$emulator" "true" "retrodeck" "$preset"
|
||||
# Check for conflicting presets for this system
|
||||
while IFS=: read -r preset_being_checked known_incompatible_preset; do
|
||||
if [[ "$preset" == "$preset_being_checked" ]]; then
|
||||
if [[ $(get_setting_value "$rd_conf" "$emulator" "retrodeck" "$known_incompatible_preset") == "true" ]]; then
|
||||
changed_presets=("${changed_presets[@]}" "$known_incompatible_preset")
|
||||
set_setting_value "$rd_conf" "$emulator" "false" "retrodeck" "$known_incompatible_preset"
|
||||
while IFS=: read -r preset_being_checked known_incompatible_preset || [[ -n "$preset_being_checked" ]];
|
||||
do
|
||||
if [[ ! $preset_being_checked == "#"* ]] && [[ ! -z "$preset_being_checked" ]]; then
|
||||
if [[ "$preset" == "$preset_being_checked" ]]; then
|
||||
if [[ $(get_setting_value "$rd_conf" "$emulator" "retrodeck" "$known_incompatible_preset") == "true" ]]; then
|
||||
changed_presets=("${changed_presets[@]}" "$known_incompatible_preset")
|
||||
set_setting_value "$rd_conf" "$emulator" "false" "retrodeck" "$known_incompatible_preset"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done < "$incompatible_presets_reference_list"
|
||||
|
|
@ -118,79 +121,81 @@ build_preset_config() {
|
|||
local read_system_enabled=$(get_setting_value "$rd_conf" "$read_system_name" "retrodeck" "$current_preset")
|
||||
while IFS='^' read -r action read_preset read_setting_name new_setting_value section target_file defaults_file || [[ -n "$action" ]];
|
||||
do
|
||||
case "$action" in
|
||||
if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then
|
||||
case "$action" in
|
||||
|
||||
"config_file_format" )
|
||||
if [[ "$read_preset" == "retroarch-all" ]]; then
|
||||
local retroarch_all="true"
|
||||
local read_config_format="retroarch"
|
||||
else
|
||||
local read_config_format="$read_preset"
|
||||
fi
|
||||
;;
|
||||
"config_file_format" )
|
||||
if [[ "$read_preset" == "retroarch-all" ]]; then
|
||||
local retroarch_all="true"
|
||||
local read_config_format="retroarch"
|
||||
else
|
||||
local read_config_format="$read_preset"
|
||||
fi
|
||||
;;
|
||||
|
||||
"change" )
|
||||
if [[ "$read_preset" == "$current_preset" ]]; then
|
||||
if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable
|
||||
eval target_file=$target_file
|
||||
fi
|
||||
local read_target_file="$target_file"
|
||||
if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable
|
||||
eval defaults_file=$defaults_file
|
||||
fi
|
||||
local read_defaults_file="$defaults_file"
|
||||
if [[ "$read_system_enabled" == "true" ]]; then
|
||||
if [[ "$new_setting_value" = \$* ]]; then
|
||||
eval new_setting_value=$new_setting_value
|
||||
"change" )
|
||||
if [[ "$read_preset" == "$current_preset" ]]; then
|
||||
if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable
|
||||
eval target_file=$target_file
|
||||
fi
|
||||
if [[ "$read_config_format" == "retroarch" && ! "$retroarch_all" == "true" ]]; then # If this is a RetroArch core, generate the override file
|
||||
if [[ ! -f "$read_target_file" ]]; then
|
||||
create_dir "$(realpath "$(dirname "$read_target_file")")"
|
||||
echo "$read_setting_name = \""$new_setting_value"\"" > "$read_target_file"
|
||||
else
|
||||
if [[ -z $(grep -o -P "^$read_setting_name\b" "$read_target_file") ]]; then
|
||||
add_setting "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"
|
||||
local read_target_file="$target_file"
|
||||
if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable
|
||||
eval defaults_file=$defaults_file
|
||||
fi
|
||||
local read_defaults_file="$defaults_file"
|
||||
if [[ "$read_system_enabled" == "true" ]]; then
|
||||
if [[ "$new_setting_value" = \$* ]]; then
|
||||
eval new_setting_value=$new_setting_value
|
||||
fi
|
||||
if [[ "$read_config_format" == "retroarch" && ! "$retroarch_all" == "true" ]]; then # If this is a RetroArch core, generate the override file
|
||||
if [[ ! -f "$read_target_file" ]]; then
|
||||
create_dir "$(realpath "$(dirname "$read_target_file")")"
|
||||
echo "$read_setting_name = \""$new_setting_value"\"" > "$read_target_file"
|
||||
else
|
||||
set_setting_value "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"
|
||||
fi
|
||||
if [[ -z $(grep -o -P "^$read_setting_name\b" "$read_target_file") ]]; then
|
||||
add_setting "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"
|
||||
else
|
||||
set_setting_value "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
set_setting_value "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"
|
||||
fi
|
||||
else
|
||||
set_setting_value "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"
|
||||
fi
|
||||
else
|
||||
if [[ "$read_config_format" == "retroarch" && ! "$retroarch_all" == "true" ]]; then
|
||||
if [[ -f "$read_target_file" ]]; then
|
||||
delete_setting "$read_target_file" "$read_setting_name" "$read_config_format" "$section"
|
||||
if [[ -z $(cat "$read_target_file") ]]; then # If the override file is empty
|
||||
rm -f "$read_target_file"
|
||||
fi
|
||||
if [[ -z $(ls -1 "$(dirname "$read_target_file")") ]]; then # If the override folder is empty
|
||||
rmdir "$(realpath "$(dirname "$read_target_file")")"
|
||||
if [[ "$read_config_format" == "retroarch" && ! "$retroarch_all" == "true" ]]; then
|
||||
if [[ -f "$read_target_file" ]]; then
|
||||
delete_setting "$read_target_file" "$read_setting_name" "$read_config_format" "$section"
|
||||
if [[ -z $(cat "$read_target_file") ]]; then # If the override file is empty
|
||||
rm -f "$read_target_file"
|
||||
fi
|
||||
if [[ -z $(ls -1 "$(dirname "$read_target_file")") ]]; then # If the override folder is empty
|
||||
rmdir "$(realpath "$(dirname "$read_target_file")")"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
local default_setting_value=$(get_setting_value "$read_defaults_file" "$read_setting_name" "$read_config_format" "$section")
|
||||
set_setting_value "$read_target_file" "$read_setting_name" "$default_setting_value" "$read_config_format" "$section"
|
||||
fi
|
||||
else
|
||||
local default_setting_value=$(get_setting_value "$read_defaults_file" "$read_setting_name" "$read_config_format" "$section")
|
||||
set_setting_value "$read_target_file" "$read_setting_name" "$default_setting_value" "$read_config_format" "$section"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
|
||||
"enable" )
|
||||
if [[ "$read_preset" == "$current_preset" ]]; then
|
||||
if [[ "$read_system_enabled" == "true" ]]; then
|
||||
enable_file "$read_setting_name"
|
||||
else
|
||||
disable_file "$read_setting_name"
|
||||
"enable" )
|
||||
if [[ "$read_preset" == "$current_preset" ]]; then
|
||||
if [[ "$read_system_enabled" == "true" ]]; then
|
||||
enable_file "$read_setting_name"
|
||||
else
|
||||
disable_file "$read_setting_name"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
|
||||
* )
|
||||
echo "Other data: $action $read_preset $read_setting_name $new_setting_value $section" # DEBUG
|
||||
;;
|
||||
* )
|
||||
echo "Other data: $action $read_preset $read_setting_name $new_setting_value $section" # DEBUG
|
||||
;;
|
||||
|
||||
esac
|
||||
esac
|
||||
fi
|
||||
done < <(cat "$presets_dir/$read_system_name"_presets.cfg)
|
||||
fi
|
||||
done < <(printf '%s\n' "$preset_section")
|
||||
|
|
|
|||
Loading…
Reference in a new issue