scripts/user_settings_asm.sh: give priority to user_settings.h found via the supplied search path arguments, and fall back to current directory; use POSIX sh variable expansions for prefix trimming and variable existence testing; trim trailing slash from supplied search path arguments; direct error messages to stderr.

This commit is contained in:
Daniel Pouzzner
2022-10-12 11:20:56 -05:00
parent e05d044cf9
commit 67c194edf8

View File

@ -1,28 +1,22 @@
#!/bin/sh #!/bin/sh
if test $# -eq 0; then if test $# -eq 0; then
echo "user_settings_asm.sh requires one argument specifying compiler flags to pull include directories from." echo "user_settings_asm.sh requires one argument specifying compiler flags to pull include directories from." 1>&2
exit 1 exit 1
fi fi
user_settings_path=""
user_settings_dir="./"
# First, see if user_settings.h is in the current directory.
if test -e "user_settings.h"; then
user_settings_path="user_settings.h"
else
search_string="$1"
# Compress multiple spaces to single spaces, then replace instances of # Compress multiple spaces to single spaces, then replace instances of
# "-I " with "-I" (i.e. remove spaces between -I and the include path). # "-I " with "-I" (i.e. remove spaces between -I and the include path).
search_string=$(echo "$search_string" | sed -e 's/ */ /g' -e 's/-I /-I/g') search_string=$(echo "$1" | sed -e 's/ */ /g' -e 's/-I /-I/g')
for token in $search_string for token in $search_string
do do
case "$token" in case "$token" in
-I*) -I*)
# Trim off the leading "-I". # Trim off the leading "-I".
path=$(echo "$token" | cut -c 3-) path="${token#-I}"
# Trim off the trailing "/".
path="${path%/}"
if test -e "$path/user_settings.h"; then if test -e "$path/user_settings.h"; then
user_settings_dir="$path" user_settings_dir="$path"
user_settings_path="$path/user_settings.h" user_settings_path="$path/user_settings.h"
@ -33,10 +27,17 @@ else
;; ;;
esac esac
done done
# Fall back to user_settings.h in the current directory.
if test -z "${user_settings_path-}"; then
if test -e "user_settings.h"; then
user_settings_dir="."
user_settings_path="user_settings.h"
fi
fi fi
if test -z "$user_settings_path"; then if test -z "${user_settings_path-}"; then
echo "Unable to find user_settings.h." echo "Unable to find user_settings.h." 1>&2
exit 1 exit 1
else else
# Strip out anything from user_settings.h that isn't a preprocessor # Strip out anything from user_settings.h that isn't a preprocessor