Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-04-10 19:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GZDOOM: updated wrapper to raise an error on filename containing a single quote

Browse source
This commit is contained in:
XargonWan 2025-01-23 11:23:47 +09:00
parent 3ccd91c320
commit 24c7409bff
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
config/gzdoom/gzdoom.sh
View file

@ -1,6 +1,7 @@
#!/bin/bash # Source the global.sh script if not already sourced
if [ -z "${GLOBAL_SOURCED+x}" ]; then
source /app/libexec/logger.sh source /app/libexec/global.sh
fi
# Define the IWAD files list # Define the IWAD files list
IWAD_FILES=("DOOM1.WAD" "DOOM.WAD" "DOOM2.WAD" "DOOM2F.WAD" "DOOM64.WAD" "TNT.WAD" IWAD_FILES=("DOOM1.WAD" "DOOM.WAD" "DOOM2.WAD" "DOOM2F.WAD" "DOOM64.WAD" "TNT.WAD"
@ -15,7 +16,9 @@ is_iwad() {
local file="$1" local file="$1"
local lowercase_file="$(basename "${file,,}")" local lowercase_file="$(basename "${file,,}")"
# Loop through the list of IWAD files
for iwad in "${IWAD_FILES[@]}"; do for iwad in "${IWAD_FILES[@]}"; do
# Check if the lowercase version of the IWAD file matches the input file
if [[ "${iwad,,}" == "$lowercase_file" ]]; then if [[ "${iwad,,}" == "$lowercase_file" ]]; then
echo "true" echo "true"
return return
@ -42,7 +45,17 @@ search_file_recursive() {
} }
# Main script # Main script
log "[INFO] RetroDECK GZDOOM wrapper init" log d "RetroDECK GZDOOM wrapper init"
# Check if the filename contains a single quote
if [[ "$1" == *"'"* ]]; then
log e "Invalid filename: \"$1\" contains a single quote.\nPlease rename the file in a proper way before continuing."
rd_zenity --error --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK" \
--text="<span foreground='$purple'><b>Invalid filename\n\n</b></span>\"$1\" contains a single quote.\nPlease rename the file in a proper way before continuing."
exit 1
fi
# Check if $1 is not a .doom file # Check if $1 is not a .doom file
if [[ "${1##*.}" != "doom" ]]; then if [[ "${1##*.}" != "doom" ]]; then
@ -57,7 +70,7 @@ if [[ "${1##*.}" != "doom" ]]; then
log i "Loading: \"$1\"" log i "Loading: \"$1\""
log i "Executing command \"$command\"" log i "Executing command \"$command\""
# Execute the command # Execute the command with double quotes
eval "$command" eval "$command"
# Check if $1 is a .doom file # Check if $1 is a .doom file
@ -79,6 +92,16 @@ else
command="gzdoom -config /var/config/gzdoom/gzdoom.ini" command="gzdoom -config /var/config/gzdoom/gzdoom.ini"
while IFS= read -r line; do while IFS= read -r line; do
# Check if the line contains a single quote
if [[ "$line" == *"'"* ]]; then
log e "Invalid filename: A file containined in \"$1\" contains a single quote"
rd_zenity --error --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK" \
--text="<span foreground='$purple'><b>Invalid filename\n\n</b></span>A file containined in \"$1\" contains a single quote.\nPlease rename the file and fix its name in the .doom file."
exit 1
fi
# Search for the file recursively # Search for the file recursively
found_file=$(search_file_recursive "$line" "$(dirname "$doom_file")") found_file=$(search_file_recursive "$line" "$(dirname "$doom_file")")
@ -105,6 +128,6 @@ else
# Log the command # Log the command
log i "Executing command \"$command\"" log i "Executing command \"$command\""
# Execute the command # Execute the command with double quotes
eval "$command" eval "$command"
fi fi