Skip to content

Commit d968f2b

Browse files
committed
Remove usage of $[ for arithmetic
$[ is deprecated for the more familiar $(( Required when bash8 starts testing from tox and [1] goes in [1] https://review.openstack.org/#/c/117430/ Change-Id: I8ba180be036836f37ebdbb6da36ff0be486c043e
1 parent a90898d commit d968f2b

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

lib/swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -426,22 +426,22 @@ EOF
426426
for node_number in ${SWIFT_REPLICAS_SEQ}; do
427427
local swift_node_config=${SWIFT_CONF_DIR}/object-server/${node_number}.conf
428428
cp ${SWIFT_DIR}/etc/object-server.conf-sample ${swift_node_config}
429-
generate_swift_config ${swift_node_config} ${node_number} $[OBJECT_PORT_BASE + 10 * (node_number - 1)] object
429+
generate_swift_config ${swift_node_config} ${node_number} $(( OBJECT_PORT_BASE + 10 * (node_number - 1) )) object
430430
iniset ${swift_node_config} filter:recon recon_cache_path ${SWIFT_DATA_DIR}/cache
431431
# Using a sed and not iniset/iniuncomment because we want to a global
432432
# modification and make sure it works for new sections.
433433
sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
434434

435435
swift_node_config=${SWIFT_CONF_DIR}/container-server/${node_number}.conf
436436
cp ${SWIFT_DIR}/etc/container-server.conf-sample ${swift_node_config}
437-
generate_swift_config ${swift_node_config} ${node_number} $[CONTAINER_PORT_BASE + 10 * (node_number - 1)] container
437+
generate_swift_config ${swift_node_config} ${node_number} $(( CONTAINER_PORT_BASE + 10 * (node_number - 1) )) container
438438
iniuncomment ${swift_node_config} app:container-server allow_versions
439439
iniset ${swift_node_config} app:container-server allow_versions "true"
440440
sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
441441

442442
swift_node_config=${SWIFT_CONF_DIR}/account-server/${node_number}.conf
443443
cp ${SWIFT_DIR}/etc/account-server.conf-sample ${swift_node_config}
444-
generate_swift_config ${swift_node_config} ${node_number} $[ACCOUNT_PORT_BASE + 10 * (node_number - 1)] account
444+
generate_swift_config ${swift_node_config} ${node_number} $(( ACCOUNT_PORT_BASE + 10 * (node_number - 1) )) account
445445
sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
446446
done
447447

@@ -613,9 +613,9 @@ function init_swift {
613613
swift-ring-builder account.builder create ${SWIFT_PARTITION_POWER_SIZE} ${SWIFT_REPLICAS} 1
614614

615615
for node_number in ${SWIFT_REPLICAS_SEQ}; do
616-
swift-ring-builder object.builder add z${node_number}-127.0.0.1:$[OBJECT_PORT_BASE + 10 * (node_number - 1)]/sdb1 1
617-
swift-ring-builder container.builder add z${node_number}-127.0.0.1:$[CONTAINER_PORT_BASE + 10 * (node_number - 1)]/sdb1 1
618-
swift-ring-builder account.builder add z${node_number}-127.0.0.1:$[ACCOUNT_PORT_BASE + 10 * (node_number - 1)]/sdb1 1
616+
swift-ring-builder object.builder add z${node_number}-127.0.0.1:$(( OBJECT_PORT_BASE + 10 * (node_number - 1) ))/sdb1 1
617+
swift-ring-builder container.builder add z${node_number}-127.0.0.1:$(( CONTAINER_PORT_BASE + 10 * (node_number - 1) ))/sdb1 1
618+
swift-ring-builder account.builder add z${node_number}-127.0.0.1:$(( ACCOUNT_PORT_BASE + 10 * (node_number - 1) ))/sdb1 1
619619
done
620620
swift-ring-builder object.builder rebalance
621621
swift-ring-builder container.builder rebalance

0 commit comments

Comments
 (0)