[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/52] scripts: Use $(..) instead of deprecated `..`
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 17/52] scripts: Use $(..) instead of deprecated `..` |
Date: |
Sun, 5 Jun 2016 10:42:54 +0300 |
From: Stefan Weil <address@hidden>
This fixes these warnings from shellcheck:
^-- SC2006: Use $(..) instead of deprecated `..`
Update also a comment using the same pattern.
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
scripts/clean-includes | 2 +-
scripts/create_config | 6 +++---
scripts/feature_to_c.sh | 6 +++---
scripts/make_device_config.sh | 4 ++--
scripts/qemu-binfmt-conf.sh | 2 +-
scripts/update-linux-headers.sh | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 72b47f1..adffedd 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -39,7 +39,7 @@
# However some caution is required regarding files that might be part
# of the guest agent or standalone tests.
-# for i in `git ls-tree --name-only HEAD` ; do test -f $i && \
+# for i in $(git ls-tree --name-only HEAD) ; do test -f $i && \
# grep -E '^# *include' $i | head -1 | grep 'osdep.h' ; test $? != 0 && \
# echo $i ; done
diff --git a/scripts/create_config b/scripts/create_config
index b2d2ebb..b31ca9b 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -16,7 +16,7 @@ case $line in
qemu_*dir=*) # qemu-specific directory configuration
name=${line%=*}
value=${line#*=}
- define_name=`echo $name | LC_ALL=C tr '[a-z]' '[A-Z]'`
+ define_name=$(echo $name | LC_ALL=C tr '[a-z]' '[A-Z]')
eval "define_value=\"$value\""
echo "#define CONFIG_$define_name \"$define_value\""
# save for the next definitions
@@ -72,7 +72,7 @@ case $line in
;;
ARCH=*) # configuration
arch=${line#*=}
- arch_name=`echo $arch | LC_ALL=C tr '[a-z]' '[A-Z]'`
+ arch_name=$(echo $arch | LC_ALL=C tr '[a-z]' '[A-Z]')
echo "#define HOST_$arch_name 1"
;;
HOST_USB=*)
@@ -92,7 +92,7 @@ case $line in
;;
TARGET_BASE_ARCH=*) # configuration
target_base_arch=${line#*=}
- base_arch_name=`echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]'`
+ base_arch_name=$(echo $target_base_arch | LC_ALL=C tr '[a-z]' '[A-Z]')
echo "#define TARGET_$base_arch_name 1"
;;
TARGET_XML_FILES=*)
diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh
index e4387b7..c8ce9b8 100644
--- a/scripts/feature_to_c.sh
+++ b/scripts/feature_to_c.sh
@@ -33,7 +33,7 @@ if test -e "$output"; then
fi
for input; do
- arrayname=xml_feature_`echo $input | sed 's,.*/,,; s/[-.]/_/g'`
+ arrayname=xml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g')
${AWK:-awk} 'BEGIN { n = 0
printf "#include \"qemu/osdep.h\"\n"
@@ -67,8 +67,8 @@ echo >> $output
echo "const char *const xml_builtin[][2] = {" >> $output
for input; do
- basename=`echo $input | sed 's,.*/,,'`
- arrayname=xml_feature_`echo $input | sed 's,.*/,,; s/[-.]/_/g'`
+ basename=$(echo $input | sed 's,.*/,,')
+ arrayname=xml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g')
echo " { \"$basename\", $arrayname }," >> $output
done
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index c1afb3f..354af31 100644
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -7,7 +7,7 @@
src=$1
dep=$2
target=$3
-src_dir=`dirname $src`
+src_dir=$(dirname $src)
all_includes=
process_includes () {
@@ -20,7 +20,7 @@ process_includes () {
f=$src
while [ -n "$f" ] ; do
- f=`cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $2}'`
+ f=$(cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $2}')
[ $? = 0 ] || exit 1
all_includes="$all_includes $f"
done
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 289b1a3..f5bba70 100644
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -10,7 +10,7 @@ if [ ! -f /proc/sys/fs/binfmt_misc/register ]; then
fi
# probe cpu type
-cpu=`uname -m`
+cpu=$(uname -m)
case "$cpu" in
i386|i486|i586|i686|i86pc|BePC|x86_64)
cpu="i386"
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index f7d62d9..08c4c4a 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL version 2.
# See the COPYING file in the top-level directory.
-tmpdir=`mktemp -d`
+tmpdir=$(mktemp -d)
linux="$1"
output="$2"
--
2.1.4
- [Qemu-devel] [PULL 49/52] linux-user: Use DIV_ROUND_UP, (continued)
- [Qemu-devel] [PULL 49/52] linux-user: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 28/52] clean-includes: Add glib.h to list of unneeded includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 37/52] coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 48/52] slirp: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 47/52] usb: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 40/52] qed: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 44/52] audio: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 46/52] rocker: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 01/52] s390x/virtio-ccw: fix spelling, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 27/52] pc: cleanup unused struct PcRomPciInfo, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 17/52] scripts: Use $(..) instead of deprecated `..`,
Michael Tokarev <=
- [Qemu-devel] [PULL 26/52] e1000: Removing unnecessary if statement, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 34/52] qemu-common.h: Drop WORDS_ALIGNED define, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 32/52] docs/multi-thread-compression: Fix wrong command string, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 05/52] fsdev: spelling fix, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 18/52] ICH9: fix typo, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 38/52] parallels: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 15/52] qemu-options.hx: Specify the units for -machine kvm_shadow_mem, Michael Tokarev, 2016/06/05
- Re: [Qemu-devel] [PULL 00/52] Trivial patches for 2016-06-05, Peter Maydell, 2016/06/06