91 lines
2.9 KiB
Diff
91 lines
2.9 KiB
Diff
From 6f1b97c06f116945553846cb0c5c3d949c953890 Mon Sep 17 00:00:00 2001
|
|
From: wangjinlei <wangjinlei_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 24 Nov 2022 19:29:07 +0800
|
|
Subject: [PATCH 19/29] configure: Add missing quoting for some easy cases
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This commit adds quotes in some places which:
|
|
* are spotted by shellcheck
|
|
* are obviously incorrect
|
|
* are easy to fix just by adding the quotes
|
|
|
|
It doesn't attempt fix all of the places shellcheck finds errors,
|
|
or even all the ones which are easy to fix. It's just a random
|
|
sampling which is hopefully easy to review and which cuts
|
|
down the size of the problem for next time somebody wants to
|
|
try to look at shellcheck errors.
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Message-id: 20220825150703.4074125-4-peter.maydell@linaro.org
|
|
|
|
Signed-off-by: wangjinlei <wangjinlei_yewu@cmss.chinamobile.com>
|
|
---
|
|
configure | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 8cbf186296..737572c8e6 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -57,7 +57,7 @@ GNUmakefile: ;
|
|
|
|
EOF
|
|
cd build
|
|
- exec $source_path/configure "$@"
|
|
+ exec "$source_path/configure" "$@"
|
|
fi
|
|
|
|
# Temporary directory used for files created while
|
|
@@ -728,7 +728,7 @@ fi
|
|
|
|
werror=""
|
|
|
|
-. $source_path/scripts/meson-buildoptions.sh
|
|
+. "$source_path/scripts/meson-buildoptions.sh"
|
|
|
|
meson_options=
|
|
meson_option_parse() {
|
|
@@ -745,7 +745,7 @@ for opt do
|
|
case "$opt" in
|
|
--help|-h) show_help=yes
|
|
;;
|
|
- --version|-V) exec cat $source_path/VERSION
|
|
+ --version|-V) exec cat "$source_path/VERSION"
|
|
;;
|
|
--prefix=*) prefix="$optarg"
|
|
;;
|
|
@@ -1503,7 +1503,7 @@ python="$python -B"
|
|
if test -z "$meson"; then
|
|
if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.3; then
|
|
meson=meson
|
|
- elif test $git_submodules_action != 'ignore' ; then
|
|
+ elif test "$git_submodules_action" != 'ignore' ; then
|
|
meson=git
|
|
elif test -e "${source_path}/meson/meson.py" ; then
|
|
meson=internal
|
|
@@ -3352,7 +3352,7 @@ if test "$QEMU_GA_DISTRO" = ""; then
|
|
QEMU_GA_DISTRO=Linux
|
|
fi
|
|
if test "$QEMU_GA_VERSION" = ""; then
|
|
- QEMU_GA_VERSION=$(cat $source_path/VERSION)
|
|
+ QEMU_GA_VERSION=$(cat "$source_path"/VERSION)
|
|
fi
|
|
|
|
QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
|
|
@@ -3790,7 +3790,7 @@ fi
|
|
for target in $target_list; do
|
|
target_dir="$target"
|
|
target_name=$(echo $target | cut -d '-' -f 1)
|
|
- mkdir -p $target_dir
|
|
+ mkdir -p "$target_dir"
|
|
case $target in
|
|
*-user) symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" ;;
|
|
*) symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_name" ;;
|
|
--
|
|
2.27.0
|
|
|