From ed5bb5660203bbdeae808fe06da58538b3f62a60 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Wed, 8 Nov 2006 13:22:08 +0000 Subject: [PATCH] Replace uses of [ ... == ... ] with the POSIX-legal single-equals. Tidy up external-device-migrate script in its handling of parameters. Patch from Roland Illig . Signed-off-by: Ewan Mellor --- tools/examples/blktap | 2 +- tools/examples/block | 30 +++++++------- tools/examples/external-device-migrate | 56 ++++++++++---------------- tools/examples/vif-bridge | 2 +- tools/examples/vif-nat | 4 +- tools/examples/vif-route | 2 +- 6 files changed, 41 insertions(+), 55 deletions(-) diff --git a/tools/examples/blktap b/tools/examples/blktap index ba9f4ee52f..4af9286055 100644 --- a/tools/examples/blktap +++ b/tools/examples/blktap @@ -7,7 +7,7 @@ dir=$(dirname "$0") findCommand "$@" -if [ "$command" == 'add' ] +if [ "$command" = 'add' ] then success fi diff --git a/tools/examples/block b/tools/examples/block index 93d7550e06..8ec73231bf 100644 --- a/tools/examples/block +++ b/tools/examples/block @@ -68,7 +68,7 @@ check_sharing() local devmm=$(device_major_minor "$dev") local file - if [ "$mode" == 'w' ] + if [ "$mode" = 'w' ] then toskip="^$" else @@ -81,7 +81,7 @@ check_sharing() then local d=$(device_major_minor "$file") - if [ "$d" == "$devmm" ] + if [ "$d" = "$devmm" ] then echo 'local' return @@ -96,9 +96,9 @@ check_sharing() do d=$(xenstore_read_default "$base_path/$dom/$dev/physical-device" "") - if [ "$d" == "$devmm" ] + if [ "$d" = "$devmm" ] then - if [ "$mode" == 'w' ] + if [ "$mode" = 'w' ] then if ! same_vm $dom then @@ -109,7 +109,7 @@ check_sharing() local m=$(xenstore_read "$base_path/$dom/$dev/mode") m=$(canonicalise_mode "$m") - if [ "$m" == 'w' ] + if [ "$m" = 'w' ] then if ! same_vm $dom then @@ -138,7 +138,7 @@ same_vm() local othervm=$(xenstore_read_default "/local/domain/$otherdom/vm" \ "$FRONTEND_UUID") - [ "$FRONTEND_UUID" == "$othervm" ] + [ "$FRONTEND_UUID" = "$othervm" ] } @@ -153,7 +153,7 @@ check_device_sharing() local mode=$(canonicalise_mode "$2") local result - if [ "$mode" == '!' ] + if [ "x$mode" = 'x!' ] then return 0 fi @@ -202,7 +202,7 @@ do_ebusy() local mode="$2" local result="$3" - if [ "$result" == 'guest' ] + if [ "$result" = 'guest' ] then dom='a guest ' when='now' @@ -211,7 +211,7 @@ do_ebusy() when='by a guest' fi - if [ "$mode" == 'w' ] + if [ "$mode" = 'w' ] then m1='' m2='' @@ -266,7 +266,7 @@ case "$command" in claim_lock "block" - if [ "$mode" == 'w' ] && ! stat "$file" -c %A | grep -q w + if [ "$mode" = 'w' ] && ! stat "$file" -c %A | grep -q w then release_lock "block" ebusy \ @@ -287,7 +287,7 @@ mount it read-write in a guest domain." if [ "$f" ] then # $dev is in use. Check sharing. - if [ "$mode" == '!' ] + if [ "x$mode" = 'x!' ] then continue fi @@ -307,7 +307,7 @@ mount it read-write in a guest domain." do d=$(xenstore_read_default \ "$XENBUS_BASE_PATH/$dom/$domdev/node" "") - if [ "$d" == "$dev" ] + if [ "$d" = "$dev" ] then f=$(xenstore_read "$XENBUS_BASE_PATH/$dom/$domdev/params") found=1 @@ -347,7 +347,7 @@ mount it read-write in a guest domain." f=$(readlink -f "$f" || echo $(dirname "$file")/$(basename "$f")) - if [ "$f" == "$file" ] + if [ "$f" = "$file" ] then check_file_sharing "$file" "$dev" "$mode" fi @@ -355,14 +355,14 @@ mount it read-write in a guest domain." # $dev is not in use, so we'll remember it for use later; we want # to finish the sharing check first. - if [ "$loopdev" == '' ] + if [ "$loopdev" = '' ] then loopdev="$dev" fi fi done - if [ "$loopdev" == '' ] + if [ "$loopdev" = '' ] then fatal 'Failed to find an unused loop device' fi diff --git a/tools/examples/external-device-migrate b/tools/examples/external-device-migrate index 7d58454525..423c513930 100644 --- a/tools/examples/external-device-migrate +++ b/tools/examples/external-device-migrate @@ -55,41 +55,27 @@ function evaluate_params() { local step host domname typ recover filename func stype stype="" - while [ 1 ]; do - if [ "$1" == "-step" ]; then - shift - step=$1 - elif [ "$1" == "-host" ]; then - shift - host=$1 - elif [ "$1" == "-domname" ]; then - shift - domname=$1 - elif [ "$1" == "-type" ]; then - shift - typ=$1 - elif [ "$1" == "-subtype" ]; then - shift - stype="_$1" - elif [ "$1" == "-recover" ]; then - recover=1 - elif [ "$1" == "-help" ]; then - ext_dev_migrate_usage - exit - else - break - fi - shift + while [ $# -ge 1 ]; do + case "$1" in + -step) step=$2; shift 2;; + -host) host=$2; shift 2;; + -domname) domname=$2; shift 2;; + -type) type=$2; shift 2;; + -subtype) subtype=$2; shift 2;; + -recover) recover=1; shift;; + -help) ext_dev_migrate_usage; exit 0;; + *) break;; + esac done - if [ "$step" == "" -o \ - "$host" == "" -o \ - "$typ" == "" -o \ - "$domname" == "" ]; then - echo "Error: Parameter(s) missing (-step/-host/-type/-domname)" - echo "" - echo "$0 -help for usage." - exit + if [ "$step" = "" -o \ + "$host" = "" -o \ + "$typ" = "" -o \ + "$domname" = "" ]; then + echo "Error: Parameter(s) missing (-step/-host/-type/-domname)" 1>&2 + echo "" 1>&2 + echo "$0 -help for usage." 1>&2 + exit 1 fi filename="$dir/$typ$stype-migration.sh" @@ -99,7 +85,7 @@ function evaluate_params() fi . "$filename" - if [ "$recover" == "1" ]; then + if [ "$recover" = "1" ]; then func="$typ"_recover eval $func $host $domname $step $* else @@ -108,4 +94,4 @@ function evaluate_params() fi } -evaluate_params $* +evaluate_params "$@" diff --git a/tools/examples/vif-bridge b/tools/examples/vif-bridge index c9d2b49316..7008210579 100755 --- a/tools/examples/vif-bridge +++ b/tools/examples/vif-bridge @@ -61,7 +61,7 @@ esac handle_iptable log debug "Successful vif-bridge $command for $vif, bridge $bridge." -if [ "$command" == "online" ] +if [ "$command" = "online" ] then success fi diff --git a/tools/examples/vif-nat b/tools/examples/vif-nat index 0f1cb1c89f..29611654eb 100644 --- a/tools/examples/vif-nat +++ b/tools/examples/vif-nat @@ -72,7 +72,7 @@ dotted_quad() } -if [ "$ip" == "" ] +if [ "$ip" = "" ] then ip=$(ip_from_dom) fi @@ -152,7 +152,7 @@ esac handle_iptable log debug "Successful vif-nat $command for $vif." -if [ "$command" == "online" ] +if [ "$command" = "online" ] then success fi diff --git a/tools/examples/vif-route b/tools/examples/vif-route index 70ac49fc51..8d0fb8d76c 100755 --- a/tools/examples/vif-route +++ b/tools/examples/vif-route @@ -50,7 +50,7 @@ fi handle_iptable log debug "Successful vif-route $command for $vif." -if [ "$command" == "online" ] +if [ "$command" = "online" ] then success fi -- 2.30.2