gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fix issues pointed out by shellcheck

Browse Source 
Some are real bugs, some are bashisms, but most is zealous quoting of
variables.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2024-08-27 16:14:51 +02:00
committed by Stan
parent 0feeb5884a
commit 6f5ac7c4ae
14 changed files with 165 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/clean-workspaces.sh
+1 -1
View File
@@ -3,7 +3,7 @@
# This script remains for backwards compatibility, but consists of a single
# git command.
cd "$(dirname $0)/../../"
cd "$(dirname "$0")/../../" || exit 1
git clean -fx build source
echo "WARNING: This script has been split with libraries/clean-source-libs.sh"
build/workspaces/update-workspaces.sh
+8 -5
View File
@@ -7,7 +7,7 @@ fi
die()
{
echo ERROR: $*
echo ERROR: "$*"
exit 1
}
@@ -24,7 +24,7 @@ case "$OS" in
;;
esac
cd "$(dirname $0)"
cd "$(dirname "$0")" || die
# Now in build/workspaces/ (where we assume this script resides)
# Parse command-line options:
@@ -55,7 +55,7 @@ if [ "$enable_atlas" = "true" ]; then
export WX_CONFIG="${WX_CONFIG:="wx-config"}"
fi
if [ ! -x "$(command -v $WX_CONFIG)" ]; then
if [ ! -x "$(command -v "$WX_CONFIG")" ]; then
echo 'WX_CONFIG must be set and valid or wx-config must be present when --atlas is passed as argument.'
exit 1
fi
@@ -63,12 +63,12 @@ fi
if [ "$OS" = "Darwin" ]; then
# Set minimal SDK version
export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.12"}
export MIN_OSX_VERSION="${MIN_OSX_VERSION:="10.12"}"
fi
# Now build Premake or use system's.
cd ../premake
cd ../premake || die
premake_command="premake5"
if [ "$with_system_premake5" = "false" ]; then
@@ -85,10 +85,13 @@ export HOSTTYPE="$HOSTTYPE"
# Now run Premake to create the makefiles
echo "Premake args: ${premake_args}"
if [ "$OS" != "Darwin" ]; then
# shellcheck disable=SC2086
${premake_command} --file="premake5.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
else
# shellcheck disable=SC2086
${premake_command} --file="premake5.lua" --outpath="../workspaces/gcc/" --macosx-version-min="${MIN_OSX_VERSION}" ${premake_args} gmake || die "Premake failed"
# Also generate xcode workspaces if on OS X
# shellcheck disable=SC2086
${premake_command} --file="premake5.lua" --outpath="../workspaces/xcode4" --macosx-version-min="${MIN_OSX_VERSION}" ${premake_args} xcode4 || die "Premake failed"
fi