Skip to content

Commit 1c92f58

Browse files
Sidharth-Singh10Sidharth-Singh10
authored
fix: replace deprecated backticks with $(...) for command substitution (#6337)
1 parent 5f493a5 commit 1c92f58

4 files changed

+39
-41
lines changed

‎INSTALL_dependencies.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ set -o nounset
3737

3838
# utilities
3939
# convert semver to comparable integer
40-
if [[ `id -u` -ne 0 ]]; then
40+
if [[ "$(id -u)" -ne 0 ]]; then
4141
print_info "requires sudo"
4242
SUDO=sudo
4343
else
4444
SUDO=""
4545
fi
4646

4747
ver () {
48-
printf "%03d%03d%03d%03d" `echo "$1" | tr '.' ' '`;
48+
printf "%03d%03d%03d%03d" "$(echo "$1" | tr '.' ' ')";
4949
}
5050

51-
PROGNAME=`basename $0`
51+
PROGNAME="$(basename $0)"
5252
print_info () {
5353
echo -e "$PROGNAME: $*"
5454
}
@@ -125,10 +125,10 @@ if command -v cargo > /dev/null; then
125125

126126
need_cmd rustc
127127

128-
RUST_VERSION=`rustc -V | cut -d " " -f 2`
128+
RUST_VERSION="$(rustc -V | cut -d " " -f 2)"
129129

130-
_HAVE_VERSION=`ver ${RUST_VERSION}`
131-
_NEED_VERSION=`ver ${RUST_MSRV}`
130+
_HAVE_VERSION="$(ver ${RUST_VERSION})"
131+
_NEED_VERSION="$(ver ${RUST_MSRV})"
132132

133133
print_info "Found rust version \"${RUST_VERSION}\". MSRV is \"${RUST_MSRV}\""
134134

@@ -166,7 +166,7 @@ install_dep () {
166166
$INSTALL_CMD $*
167167
}
168168

169-
if [[ ! -x "`command -v psql`" ]] || [[ ! -x "`command -v redis-server`" ]] ; then
169+
if [[ ! -x "$(command -v psql)" ]] || [[ ! -x "$(command -v redis-server)" ]] ; then
170170
print_info "Missing dependencies. Trying to install"
171171

172172
# java has an apt which seems to mess up when we look for apt

‎aws/hyperswitch_aws_setup.sh

+24-26
Original file line numberDiff line numberDiff line change
@@ -38,37 +38,35 @@ echo "Creating Security Group for Application..."
3838

3939
export EC2_SG="application-sg"
4040

41-
echo `(aws ec2 create-security-group \
41+
echo "$(aws ec2 create-security-group \
4242
--region $REGION \
4343
--group-name $EC2_SG \
4444
--description "Security Group for Hyperswitch EC2 instance" \
45-
--tag-specifications "ResourceType=security-group,Tags=[{Key=ManagedBy,Value=hyperswitch}]" \
46-
)`
45+
--tag-specifications "ResourceType=security-group,Tags=[{Key=ManagedBy,Value=hyperswitch}]")"
4746

4847
export APP_SG_ID=$(aws ec2 describe-security-groups --group-names $EC2_SG --region $REGION --output text --query 'SecurityGroups[0].GroupId')
4948

5049
echo "Security Group for Application CREATED.\n"
5150

5251
echo "Creating Security Group ingress for port 80..."
5352

54-
echo `aws ec2 authorize-security-group-ingress \
53+
echo "$(aws ec2 authorize-security-group-ingress \
5554
--group-id $APP_SG_ID \
5655
--protocol tcp \
5756
--port 80 \
5857
--cidr 0.0.0.0/0 \
59-
--region $REGION`
58+
--region $REGION)"
6059

6160
echo "Security Group ingress for port 80 CREATED.\n"
6261

63-
6462
echo "Creating Security Group ingress for port 22..."
6563

66-
echo `aws ec2 authorize-security-group-ingress \
64+
echo "$(aws ec2 authorize-security-group-ingress \
6765
--group-id $APP_SG_ID \
6866
--protocol tcp \
6967
--port 22 \
7068
--cidr 0.0.0.0/0 \
71-
--region $REGION`
69+
--region $REGION)"
7270

7371
echo "Security Group ingress for port 22 CREATED.\n"
7472

@@ -78,11 +76,11 @@ echo "Security Group ingress for port 22 CREATED.\n"
7876
echo "Creating Security Group for Elasticache..."
7977

8078
export REDIS_GROUP_NAME=redis-sg
81-
echo `aws ec2 create-security-group \
79+
echo "$(aws ec2 create-security-group \
8280
--group-name $REDIS_GROUP_NAME \
8381
--description "SG attached to elasticache" \
8482
--tag-specifications "ResourceType=security-group,Tags=[{Key=ManagedBy,Value=hyperswitch}]" \
85-
--region $REGION`
83+
--region $REGION)"
8684

8785
echo "Security Group for Elasticache CREATED.\n"
8886

@@ -91,12 +89,12 @@ echo "Creating Inbound rules for Redis..."
9189
export REDIS_SG_ID=$(aws ec2 describe-security-groups --group-names $REDIS_GROUP_NAME --region $REGION --output text --query 'SecurityGroups[0].GroupId')
9290

9391
# CREATE INBOUND RULES
94-
echo `aws ec2 authorize-security-group-ingress \
92+
echo "$(aws ec2 authorize-security-group-ingress \
9593
--group-id $REDIS_SG_ID \
9694
--protocol tcp \
9795
--port 6379 \
9896
--source-group $EC2_SG \
99-
--region $REGION`
97+
--region $REGION)"
10098

10199
echo "Inbound rules for Redis CREATED.\n"
102100

@@ -105,11 +103,11 @@ echo "Inbound rules for Redis CREATED.\n"
105103
echo "Creating Security Group for RDS..."
106104

107105
export RDS_GROUP_NAME=rds-sg
108-
echo `aws ec2 create-security-group \
106+
echo "$(aws ec2 create-security-group \
109107
--group-name $RDS_GROUP_NAME \
110108
--description "SG attached to RDS" \
111109
--tag-specifications "ResourceType=security-group,Tags=[{Key=ManagedBy,Value=hyperswitch}]" \
112-
--region $REGION`
110+
--region $REGION)"
113111

114112
echo "Security Group for RDS CREATED.\n"
115113

@@ -118,44 +116,44 @@ echo "Creating Inbound rules for RDS..."
118116
export RDS_SG_ID=$(aws ec2 describe-security-groups --group-names $RDS_GROUP_NAME --region $REGION --output text --query 'SecurityGroups[0].GroupId')
119117

120118
# CREATE INBOUND RULES
121-
echo `aws ec2 authorize-security-group-ingress \
119+
echo "$(aws ec2 authorize-security-group-ingress \
122120
--group-id $RDS_SG_ID \
123121
--protocol tcp \
124122
--port 5432 \
125123
--source-group $EC2_SG \
126-
--region $REGION`
124+
--region $REGION)"
127125

128126
echo "Inbound rules for RDS CREATED.\n"
129127

130-
echo `aws ec2 authorize-security-group-ingress \
128+
echo "$(aws ec2 authorize-security-group-ingress \
131129
--group-id $RDS_SG_ID \
132130
--protocol tcp \
133131
--port 5432 \
134132
--cidr 0.0.0.0/0 \
135-
--region $REGION`
133+
--region $REGION)"
136134

137135
echo "Inbound rules for RDS (from any IP) CREATED.\n"
138136

139137
echo "Creating Elasticache with Redis engine..."
140138

141139
export CACHE_CLUSTER_ID=hyperswitch-cluster
142140

143-
echo `aws elasticache create-cache-cluster \
141+
echo "$(aws elasticache create-cache-cluster \
144142
--cache-cluster-id $CACHE_CLUSTER_ID \
145143
--cache-node-type cache.t3.medium \
146144
--engine redis \
147145
--num-cache-nodes 1 \
148146
--security-group-ids $REDIS_SG_ID \
149147
--engine-version 7.0 \
150148
--tags "Key=ManagedBy,Value=hyperswitch" \
151-
--region $REGION`
149+
--region $REGION)"
152150

153151
echo "Elasticache with Redis engine CREATED.\n"
154152

155153
echo "Creating RDS with PSQL..."
156154

157155
export DB_INSTANCE_ID=hyperswitch-db
158-
echo `aws rds create-db-instance \
156+
echo "$(aws rds create-db-instance \
159157
--db-instance-identifier $DB_INSTANCE_ID\
160158
--db-instance-class db.t3.micro \
161159
--engine postgres \
@@ -166,7 +164,7 @@ echo `aws rds create-db-instance \
166164
--region $REGION \
167165
--db-name hyperswitch_db \
168166
--tags "Key=ManagedBy,Value=hyperswitch" \
169-
--vpc-security-group-ids $RDS_SG_ID`
167+
--vpc-security-group-ids $RDS_SG_ID)"
170168

171169
echo "RDS with PSQL CREATED.\n"
172170

@@ -308,17 +306,17 @@ echo "EC2 instance launched.\n"
308306

309307
echo "Add Tags to EC2 instance..."
310308

311-
echo `aws ec2 create-tags \
309+
echo "$(aws ec2 create-tags \
312310
--resources $HYPERSWITCH_INSTANCE_ID \
313311
--tags "Key=Name,Value=hyperswitch-router" \
314-
--region $REGION`
312+
--region $REGION)"
315313

316314
echo "Tag added to EC2 instance.\n"
317315

318-
echo `aws ec2 create-tags \
316+
echo "$(aws ec2 create-tags \
319317
--resources $HYPERSWITCH_INSTANCE_ID \
320318
--tags "Key=ManagedBy,Value=hyperswitch" \
321-
--region $REGION`
319+
--region $REGION)"
322320

323321
echo "ManagedBy tag added to EC2 instance.\n"
324322

‎aws/hyperswitch_cleanup_setup.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ for cluster_arn in $ALL_ELASTIC_CACHE; do
4545
if [[ $? -eq 0 ]]; then
4646
echo -n "Delete $cluster_id (Y/n)? "
4747
if yes_or_no; then
48-
echo `aws elasticache delete-cache-cluster --region $REGION --cache-cluster-id $cluster_id`
48+
echo "$(aws elasticache delete-cache-cluster --region $REGION --cache-cluster-id $cluster_id)"
4949
fi
5050
fi
5151
done
@@ -59,7 +59,7 @@ echo -n "Deleting ( $ALL_KEY_PAIRS ) key pairs? (Y/n)?"
5959

6060
if yes_or_no; then
6161
for KEY_ID in $ALL_KEY_PAIRS; do
62-
echo `aws ec2 delete-key-pair --key-pair-id $KEY_ID --region $REGION`
62+
echo "$(aws ec2 delete-key-pair --key-pair-id $KEY_ID --region $REGION)"
6363
done
6464
fi
6565

@@ -78,7 +78,7 @@ echo -n "Terminating ( $ALL_INSTANCES ) instances? (Y/n)?"
7878

7979
if yes_or_no; then
8080
for INSTANCE_ID in $ALL_INSTANCES; do
81-
echo `aws ec2 terminate-instances --instance-ids $INSTANCE_ID --region $REGION`
81+
echo "$(aws ec2 terminate-instances --instance-ids $INSTANCE_ID --region $REGION)"
8282
done
8383
fi
8484

@@ -105,15 +105,15 @@ for resource_id in $ALL_DB_RESOURCES; do
105105

106106
echo -n "Create a snapshot before deleting ( $DB_INSTANCE_ID ) the database (Y/n)? "
107107
if yes_or_no; then
108-
echo `aws rds delete-db-instance \
108+
echo "$(aws rds delete-db-instance \
109109
--db-instance-identifier $DB_INSTANCE_ID \
110110
--region $REGION \
111-
--final-db-snapshot-identifier hyperswitch-db-snapshot-`date +%s``
111+
--final-db-snapshot-identifier hyperswitch-db-snapshot-$(date +%s))"
112112
else
113-
echo `aws rds delete-db-instance \
113+
echo "$(aws rds delete-db-instance \
114114
--region $REGION \
115115
--db-instance-identifier $DB_INSTANCE_ID \
116-
--skip-final-snapshot`
116+
--skip-final-snapshot)"
117117
fi
118118
fi
119119
fi

‎scripts/add_connector.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function find_prev_connector() {
88
# Add new connector to existing list and sort it
99
connectors=(aci adyen adyenplatform airwallex applepay authorizedotnet bambora bamboraapac bankofamerica billwerk bitpay bluesnap boku braintree cashtocode checkout coinbase cryptopay cybersource datatrans deutschebank digitalvirgo dlocal dummyconnector ebanx fiserv fiservemea fiuu forte globalpay globepay gocardless gpayments helcim iatapay itaubank klarna mifinity mollie multisafepay netcetera nexinets nexixpay noon novalnet nuvei opayo opennode paybox payeezy payme payone paypal payu placetopay plaid powertranz prophetpay rapyd razorpay shift4 square stax stripe taxjar threedsecureio thunes trustpay tsys volt wellsfargo wellsfargopayout wise worldline worldpay zsl "$1")
1010
IFS=$'\n' sorted=($(sort <<<"${connectors[*]}")); unset IFS
11-
res=`echo ${sorted[@]}`
11+
res="$(echo ${sorted[@]})"
1212
sed -i'' -e "s/^ connectors=.*/ connectors=($res \"\$1\")/" $self.tmp
1313
for i in "${!sorted[@]}"; do
1414
if [ "${sorted[$i]}" = "$1" ] && [ $i != "0" ]; then

0 commit comments

Comments
 (0)