Make sure variables based on $PWD are properly quoted

This fixes https://github.com/libretro/docs/issues/889
This commit is contained in:
Eric Warmenhoven 2024-01-06 00:25:55 -05:00
parent f4fc2a5ad1
commit 12ab35b2cc
4 changed files with 12 additions and 12 deletions

View File

@ -292,7 +292,7 @@ libretro_build_core() {
if [ -n "${LIBRETRO_LOG_MODULE}" ]; then
printf -v log_module "$LIBRETRO_LOG_DIR/$LIBRETRO_LOG_MODULE" "$1"
[ -z "$LIBRETRO_LOG_APPEND" ] && : > $log_module
[ -z "$LIBRETRO_LOG_APPEND" ] && : > "$log_module"
fi
eval "core_name=\${libretro_${1}_name:-$1}"
@ -327,13 +327,13 @@ libretro_build_core() {
lecho "Building ${1}..."
if [ -n "$log_module" ]; then
exec 6>&1
echo "Building ${1}..." >> $log_module
echo "Building ${1}..." >> "$log_module"
# TODO: Possibly a shell function for tee?
if [[ -n "$LIBRETRO_DEVELOPER" && -n "${cmd_tee:=$(find_tool "tee")}" ]]; then
exec > >($cmd_tee -a $log_module)
exec > >($cmd_tee -a "$log_module")
else
exec > $log_module
exec > "$log_module"
fi
fi

View File

@ -14,4 +14,4 @@ else
fi
fi
platform=ios-arm64 ${BASE_DIR}/libretro-build.sh $@
platform=ios-arm64 "${BASE_DIR}/libretro-build.sh" $@

View File

@ -14,4 +14,4 @@ else
fi
fi
platform=tvos-arm64 ${BASE_DIR}/libretro-build.sh $@
platform=tvos-arm64 "${BASE_DIR}/libretro-build.sh" $@

View File

@ -10,13 +10,13 @@ secho() {
}
lecho() {
[ -n "$LIBRETRO_LOG_SUPER" ] && echo "$@" >> $log_super
[ -n "$LIBRETRO_LOG_SUPER" ] && echo "$@" >> "$log_super"
}
lsecho() {
echo "$@"
[ -n "$log_file_only" ] && echo "$@" >&6
[ -n "$LIBRETRO_LOG_SUPER" ] && echo "$@" >> $log_super
[ -n "$LIBRETRO_LOG_SUPER" ] && echo "$@" >> "$log_super"
}
echo_cmd() {
@ -39,7 +39,7 @@ libretro_log_init() {
if [ -n "$LIBRETRO_LOG_SUPER" ]; then
log_super="$LIBRETRO_LOG_DIR/$LIBRETRO_LOG_SUPER"
# Redirecting : avoids dependency on trunc(1)
[ -z "$LIBRETRO_LOG_APPEND" ] && : > $log_super
[ -z "$LIBRETRO_LOG_APPEND" ] && : > "$log_super"
fi
# Module logs are truncated as they're opened in log_module_start
}
@ -52,13 +52,13 @@ log_module_start() {
exec 6>&1 7>&2
# Redirecting : avoids dependency on trunc(1)
[ -z "$LIBRETRO_LOG_APPEND" ] && : > $log_module
[ -z "$LIBRETRO_LOG_APPEND" ] && : > "$log_module"
# Output to screen and logfile in developer mode (if possible)
if [[ -n "$LIBRETRO_DEVELOPER" && -n "${log_tee:=$(find_tool "tee")}" ]]; then
exec >> $($log_tee -a $log_module) 2>&1
exec >> $($log_tee -a "$log_module") 2>&1
else
exec >> $log_module 2>&1
exec >> "$log_module" 2>&1
log_file_only=1
fi
fi