fix some of the bash8 issues found in functions and lib/config,
part of the long march towards fixing all the bash8 issues.
Change-Id: Ia131f64870acb0f9d196fe1a9a45d633abb6fc4d
... | ... |
@@ -1372,9 +1372,9 @@ function upload_image() { |
1372 | 1372 |
IMAGE="$FILES/${IMAGE_FNAME}" |
1373 | 1373 |
IMAGE_NAME="${IMAGE_FNAME%.xen-raw.tgz}" |
1374 | 1374 |
glance \ |
1375 |
- --os-auth-token $token \ |
|
1376 |
- --os-image-url http://$GLANCE_HOSTPORT \ |
|
1377 |
- image-create \ |
|
1375 |
+ --os-auth-token $token \ |
|
1376 |
+ --os-image-url http://$GLANCE_HOSTPORT \ |
|
1377 |
+ image-create \ |
|
1378 | 1378 |
--name "$IMAGE_NAME" --is-public=True \ |
1379 | 1379 |
--container-format=tgz --disk-format=raw \ |
1380 | 1380 |
--property vm_mode=xen < "${IMAGE}" |
... | ... |
@@ -1397,11 +1397,11 @@ function upload_image() { |
1397 | 1397 |
mkdir "$xdir" |
1398 | 1398 |
tar -zxf $FILES/$IMAGE_FNAME -C "$xdir" |
1399 | 1399 |
KERNEL=$(for f in "$xdir/"*-vmlinuz* "$xdir/"aki-*/image; do |
1400 |
- [ -f "$f" ] && echo "$f" && break; done; true) |
|
1400 |
+ [ -f "$f" ] && echo "$f" && break; done; true) |
|
1401 | 1401 |
RAMDISK=$(for f in "$xdir/"*-initrd* "$xdir/"ari-*/image; do |
1402 |
- [ -f "$f" ] && echo "$f" && break; done; true) |
|
1402 |
+ [ -f "$f" ] && echo "$f" && break; done; true) |
|
1403 | 1403 |
IMAGE=$(for f in "$xdir/"*.img "$xdir/"ami-*/image; do |
1404 |
- [ -f "$f" ] && echo "$f" && break; done; true) |
|
1404 |
+ [ -f "$f" ] && echo "$f" && break; done; true) |
|
1405 | 1405 |
if [[ -z "$IMAGE_NAME" ]]; then |
1406 | 1406 |
IMAGE_NAME=$(basename "$IMAGE" ".img") |
1407 | 1407 |
fi |
... | ... |
@@ -1692,23 +1692,23 @@ function check_path_perm_sanity() { |
1692 | 1692 |
# |
1693 | 1693 |
# _vercmp_r sep ver1 ver2 |
1694 | 1694 |
function _vercmp_r { |
1695 |
- typeset sep |
|
1696 |
- typeset -a ver1=() ver2=() |
|
1697 |
- sep=$1; shift |
|
1698 |
- ver1=("${@:1:sep}") |
|
1699 |
- ver2=("${@:sep+1}") |
|
1695 |
+ typeset sep |
|
1696 |
+ typeset -a ver1=() ver2=() |
|
1697 |
+ sep=$1; shift |
|
1698 |
+ ver1=("${@:1:sep}") |
|
1699 |
+ ver2=("${@:sep+1}") |
|
1700 | 1700 |
|
1701 |
- if ((ver1 > ver2)); then |
|
1702 |
- echo 1; return 0 |
|
1703 |
- elif ((ver2 > ver1)); then |
|
1704 |
- echo -1; return 0 |
|
1705 |
- fi |
|
1701 |
+ if ((ver1 > ver2)); then |
|
1702 |
+ echo 1; return 0 |
|
1703 |
+ elif ((ver2 > ver1)); then |
|
1704 |
+ echo -1; return 0 |
|
1705 |
+ fi |
|
1706 | 1706 |
|
1707 |
- if ((sep <= 1)); then |
|
1708 |
- echo 0; return 0 |
|
1709 |
- fi |
|
1707 |
+ if ((sep <= 1)); then |
|
1708 |
+ echo 0; return 0 |
|
1709 |
+ fi |
|
1710 | 1710 |
|
1711 |
- _vercmp_r $((sep-1)) "${ver1[@]:1}" "${ver2[@]:1}" |
|
1711 |
+ _vercmp_r $((sep-1)) "${ver1[@]:1}" "${ver2[@]:1}" |
|
1712 | 1712 |
} |
1713 | 1713 |
|
1714 | 1714 |
|
... | ... |
@@ -1730,13 +1730,13 @@ function _vercmp_r { |
1730 | 1730 |
# |
1731 | 1731 |
# vercmp_numbers ver1 ver2 |
1732 | 1732 |
vercmp_numbers() { |
1733 |
- typeset v1=$1 v2=$2 sep |
|
1734 |
- typeset -a ver1 ver2 |
|
1733 |
+ typeset v1=$1 v2=$2 sep |
|
1734 |
+ typeset -a ver1 ver2 |
|
1735 | 1735 |
|
1736 |
- IFS=. read -ra ver1 <<< "$v1" |
|
1737 |
- IFS=. read -ra ver2 <<< "$v2" |
|
1736 |
+ IFS=. read -ra ver1 <<< "$v1" |
|
1737 |
+ IFS=. read -ra ver2 <<< "$v2" |
|
1738 | 1738 |
|
1739 |
- _vercmp_r "${#ver1[@]}" "${ver1[@]}" "${ver2[@]}" |
|
1739 |
+ _vercmp_r "${#ver1[@]}" "${ver1[@]}" "${ver2[@]}" |
|
1740 | 1740 |
} |
1741 | 1741 |
|
1742 | 1742 |
|
... | ... |
@@ -10,7 +10,7 @@ |
10 | 10 |
# [[group-name|file-name]] |
11 | 11 |
# |
12 | 12 |
# group-name refers to the group of configuration file changes to be processed |
13 |
-# at a particular time. These are called phases in ``stack.sh`` but |
|
13 |
+# at a particular time. These are called phases in ``stack.sh`` but |
|
14 | 14 |
# group here as these functions are not DevStack-specific. |
15 | 15 |
# |
16 | 16 |
# file-name is the destination of the config file |
... | ... |
@@ -64,12 +64,12 @@ function get_meta_section_files() { |
64 | 64 |
[[ -r $file ]] || return 0 |
65 | 65 |
|
66 | 66 |
$CONFIG_AWK_CMD -v matchgroup=$matchgroup ' |
67 |
- /^\[\[.+\|.*\]\]/ { |
|
68 |
- gsub("[][]", "", $1); |
|
69 |
- split($1, a, "|"); |
|
70 |
- if (a[1] == matchgroup) |
|
71 |
- print a[2] |
|
72 |
- } |
|
67 |
+ /^\[\[.+\|.*\]\]/ { |
|
68 |
+ gsub("[][]", "", $1); |
|
69 |
+ split($1, a, "|"); |
|
70 |
+ if (a[1] == matchgroup) |
|
71 |
+ print a[2] |
|
72 |
+ } |
|
73 | 73 |
' $file |
74 | 74 |
} |
75 | 75 |
|