[PATCH 11/11] Add some missing quotes
Artem Bityutskiy
dedekind1 at gmail.com
Fri Feb 7 07:28:24 PST 2014
From: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
We are trying to use quotes every time we expand variables. Let's be consistent
and do this everywhere. This patch adds quotes to several paces where we missed
them.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
---
aiaiai-test-patchset | 2 +-
email/aiaiai-email-dispatcher | 4 ++--
email/aiaiai-email-dispatcher-helper | 4 ++--
email/aiaiai-email-lda | 14 +++++++-------
gerrit/aiaiai-jenkins-test-patchset | 6 +++---
helpers/aiaiai-make-kernel | 2 +-
helpers/aiaiai-sh-functions | 2 +-
helpers/aiaiai-test-bisectability | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/aiaiai-test-patchset b/aiaiai-test-patchset
index b9610bb..166bd30 100755
--- a/aiaiai-test-patchset
+++ b/aiaiai-test-patchset
@@ -261,7 +261,7 @@ quiet="-q"
while true; do
case "$1" in
-j|--jobs)
- jobs=$(opt_check_number "$1" "$2")
+ jobs="$(opt_check_number "$1" "$2")"
shift
;;
-c|--commit-id)
diff --git a/email/aiaiai-email-dispatcher b/email/aiaiai-email-dispatcher
index 5920968..9057fd3 100755
--- a/email/aiaiai-email-dispatcher
+++ b/email/aiaiai-email-dispatcher
@@ -104,7 +104,7 @@ bigjobs=1
while true; do
case "$1" in
-J|--bigjobs)
- bigjobs=$(opt_check_number "$1" "$2")
+ bigjobs="$(opt_check_number "$1" "$2")"
shift
;;
-v|--verbose) verbose="--verbose"
@@ -128,7 +128,7 @@ program_required "inotifywait" ""
[ -z "$verbose" ] || quiet=
mkdir $verbose -p -- "$1" 1>&2
-queuedir=$(readlink -fv -- "$1"); shift
+queuedir="$(readlink -fv -- "$1")"; shift
validator="$1"; shift
in_fifo="$(mktemp -dt "$PROG.in_fifo.XXXX")"
diff --git a/email/aiaiai-email-dispatcher-helper b/email/aiaiai-email-dispatcher-helper
index 9dfe115..63c56e1 100755
--- a/email/aiaiai-email-dispatcher-helper
+++ b/email/aiaiai-email-dispatcher-helper
@@ -85,9 +85,9 @@ done
[ "$#" -eq 4 ] || die "Insufficient or too many arguments"
-mbox=$(readlink -fv -- "$1"); shift
+mbox="$(readlink -fv -- "$1")"; shift
fail_file="$1"; shift
-queuedir=$(readlink -fv -- "$1"); shift
+queuedir="$(readlink -fv -- "$1")"; shift
validator="$1"; shift
tmpdir="$(mktemp -dt "$PROG.XXXX")"
diff --git a/email/aiaiai-email-lda b/email/aiaiai-email-lda
index 770f96e..ded1641 100755
--- a/email/aiaiai-email-lda
+++ b/email/aiaiai-email-lda
@@ -101,7 +101,7 @@ reject_and_reply()
if [ -n "$pcfg_name" ] && [ "$pcfg_reply_to_all" = "1" ]; then
# Strip own address
reply_cc="$(merge_addresses "$reply_cc" "$pcfg_always_cc")"
- reply_cc=$(strip_address "$reply_cc" "$cfg_ownmail")
+ reply_cc="$(strip_address "$reply_cc" "$cfg_ownmail")"
else
reply_cc=
fi
@@ -440,8 +440,8 @@ process_all_series()
while IFS= read -r dir; do
[ -n "$dir" ] || continue
# Extract the series number
- n=${dir%-*}
- n=${n##*_}
+ n="${dir%-*}"
+ n="${n##*_}"
# Clear everything from the current mbox
truncate -s0 -- "$mbox"
@@ -485,11 +485,11 @@ while true; do
test_mode=y
;;
--reap-archive)
- archive_min=$(opt_check_number "$1" "$2")
+ archive_min="$(opt_check_number "$1" "$2")"
shift
;;
--reap-incomplete)
- incomplete_min=$(opt_check_number "$1" "$2")
+ incomplete_min="$(opt_check_number "$1" "$2")"
shift
;;
-v|--verbose) verbose=-v
@@ -514,8 +514,8 @@ program_required "grep" ""
program_required "sed" ""
program_required "formail" ""
-workdir=$(readlink -fv -- "$1"); shift
-cfgfile=$(readlink -fv -- "$1"); shift
+workdir="$(readlink -fv -- "$1")"; shift
+cfgfile="$(readlink -fv -- "$1")"; shift
parse_config "$cfgfile"
diff --git a/gerrit/aiaiai-jenkins-test-patchset b/gerrit/aiaiai-jenkins-test-patchset
index 86294fc..53da26e 100755
--- a/gerrit/aiaiai-jenkins-test-patchset
+++ b/gerrit/aiaiai-jenkins-test-patchset
@@ -115,7 +115,7 @@ quiet="-q"
while true; do
case "$1" in
-j|--jobs)
- jobs=$(opt_check_number "$1" "$2")
+ jobs="$(opt_check_number "$1" "$2")"
shift
;;
-w|--workdir)
@@ -191,11 +191,11 @@ gerrit_url="$1"; shift
defconfigs="$@"
# Extract the port number to a separate variable
-gerrit_port=$(printf "%s" "$gerrit_url" | sed -n -e 's/\([^:]*\):\{0,1\}\([0-9]*\)$/\2/p')
+gerrit_port="$(printf "%s" "$gerrit_url" | sed -n -e 's/\([^:]*\):\{0,1\}\([0-9]*\)$/\2/p')"
if [ -z "$gerrit_port" ]; then
gerrit_port=29418
else
- gerrit_url=$(printf "%s" "$gerrit_url" | sed -n -e 's/\([^:]*\):\{0,1\}\([0-9]*\)$/\1/p')
+ gerrit_url="$(printf "%s" "$gerrit_url" | sed -n -e 's/\([^:]*\):\{0,1\}\([0-9]*\)$/\1/p')"
fi
verbose "Gerrit URL: $gerrit_url, port $gerrit_port"
diff --git a/helpers/aiaiai-make-kernel b/helpers/aiaiai-make-kernel
index 5604f6c..4f43890 100755
--- a/helpers/aiaiai-make-kernel
+++ b/helpers/aiaiai-make-kernel
@@ -170,7 +170,7 @@ while true; do
shift
;;
-j|--jobs)
- jobs=$(opt_check_number "$1" "$2")
+ jobs="$(opt_check_number "$1" "$2")"
shift
;;
-O|--stdout)
diff --git a/helpers/aiaiai-sh-functions b/helpers/aiaiai-sh-functions
index b32e457..8165937 100644
--- a/helpers/aiaiai-sh-functions
+++ b/helpers/aiaiai-sh-functions
@@ -22,7 +22,7 @@ print_separator()
local i=0
while [ $i -lt 80 ]; do
- i=$(($i+1));
+ i="$(("$i"+1))";
printf "-";
done
echo
diff --git a/helpers/aiaiai-test-bisectability b/helpers/aiaiai-test-bisectability
index 913c0a6..948a807 100755
--- a/helpers/aiaiai-test-bisectability
+++ b/helpers/aiaiai-test-bisectability
@@ -140,7 +140,7 @@ quiet="-q"
while true; do
case "$1" in
-j|--jobs)
- jobs=$(opt_check_number "$1" "$2")
+ jobs="$(opt_check_number "$1" "$2")"
shift
;;
-c|--commit-id)
--
1.8.5.2
More information about the aiaiai
mailing list