From 761c456a4e89802d2f78a8dbdc5f20d71716f7dd Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 21 Oct 2014 11:41:37 +1100
Subject: [PATCH] Remove usage of $[ for arithmetic, take 2
I did a similar change in I8ba180be036836f37ebdbb6da36ff0be486c043e
but I guess somehow missed these ... maybe I forgot to add them to the
change.
As described originally, this causes TOT bashate to fail, so fix this
up before it gets released.
Change-Id: I5580cb46f1c8bd71c631549aab78428d95a6dc51
---
lib/swift | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/swift b/lib/swift
index 15bd2a9471..0b9b89369e 100644
--- a/lib/swift
+++ b/lib/swift
@@ -196,9 +196,9 @@ function _config_swift_apache_wsgi {
# copy apache vhost file and set name and port
local node_number
for node_number in ${SWIFT_REPLICAS_SEQ}; do
- local object_port=$[OBJECT_PORT_BASE + 10 * ($node_number - 1)]
- local container_port=$[CONTAINER_PORT_BASE + 10 * ($node_number - 1)]
- local account_port=$[ACCOUNT_PORT_BASE + 10 * ($node_number - 1)]
+ local object_port=$(( OBJECT_PORT_BASE + 10 * (node_number - 1) ))
+ local container_port=$(( CONTAINER_PORT_BASE + 10 * (node_number - 1) ))
+ local account_port=$(( ACCOUNT_PORT_BASE + 10 * (node_number - 1) ))
sudo cp ${SWIFT_DIR}/examples/apache2/object-server.template $(apache_site_config_for object-server-${node_number})
sudo sed -e "
@@ -257,7 +257,7 @@ function generate_swift_config_services {
local bind_port=$3
local server_type=$4
- log_facility=$[ node_id - 1 ]
+ log_facility=$(( node_id - 1 ))
local node_path=${SWIFT_DATA_DIR}/${node_number}
iniuncomment ${swift_node_config} DEFAULT user