Skip to content
This repository was archived by the owner on May 3, 2024. It is now read-only.

Commit b2d837a

Browse files
committed
CORTX-30751: Codacy code cleanup (#1606)
This patch fixes some of the codacy warnings. warning fixed : "Double quote to prevent globing and words splitting". Signed-off-by: Rinku Kothiya <[email protected]>
1 parent c079391 commit b2d837a

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

scripts/provisioning/vmhost/gci-create-cluster.sh

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ script_terminate()
7676
{
7777
local RESULT=$1
7878
pwd
79-
cd $HOME_DIR
79+
cd "$HOME_DIR"
8080
print_msg "Using [$DESTROY_CLUSTER_SCRIPT $CL_DIR_TAG]"
81-
$DESTROY_CLUSTER_SCRIPT $CL_DIR_TAG "--force"
81+
"$DESTROY_CLUSTER_SCRIPT" "$CL_DIR_TAG" "--force"
8282
SCRIPT_TIME=$(( $(date +%s) - $SCRIPT_START ))
8383
if [ $RESULT != 0 ]; then
8484
print_msg "Returing $RESULT; Status: FAILED; in $SCRIPT_TIME seconds."
@@ -158,7 +158,7 @@ clone_motr()
158158
print_msg "Pulling MOTR_REF [$MOTR_REF]"
159159
cd motr
160160
print_msg "Executing [git pull $MOTR_REPO $MOTR_REF]"
161-
git pull $MOTR_REPO $MOTR_REF
161+
git pull "$MOTR_REPO" "$MOTR_REF"
162162
RESULT=$?
163163
if [ $RESULT != 0 ]; then
164164
print_msg "ERROR pulling $MOTR_REF!!!"
@@ -232,7 +232,7 @@ clone_hare()
232232

233233
print_msg "Executing [git checkout -b " \
234234
"$HARE_USER/hare-$HARE_USER_BRANCH FETCH_HEAD]"
235-
git checkout -b $HARE_USER/hare-$HARE_USER_BRANCH FETCH_HEAD
235+
git checkout -b "$HARE_USER/hare-$HARE_USER_BRANCH" FETCH_HEAD
236236
RESULT=$?
237237
if [ $RESULT != 0 ]; then
238238
print_status_and_time $FSTART $RESULT
@@ -256,7 +256,7 @@ clone_hare()
256256
fi
257257

258258
print_msg "Executing [git merge --no-ff $USER/hare-$HARE_USER_BRANCH]"
259-
git merge --no-ff $USER/hare-$HARE_USER_BRANCH
259+
git merge --no-ff "$USER/hare-$HARE_USER_BRANCH"
260260
RESULT=$?
261261
if [ $RESULT != 0 ]; then
262262
print_status_and_time $FSTART $RESULT
@@ -268,28 +268,28 @@ clone_hare()
268268

269269
use_centos76()
270270
{
271-
$M0VG env add M0_VM_BOX=centos76/dev
272-
$M0VG env add M0_VM_BOX_URL="http://cortx-storage.colo.seagate.com/vagrant/centos76/dev"
271+
"$M0VG" env add M0_VM_BOX=centos76/dev
272+
"$M0VG" env add M0_VM_BOX_URL="http://cortx-storage.colo.seagate.com/vagrant/centos76/dev"
273273
}
274274

275275
use_centos77()
276276
{
277-
$M0VG env add M0_VM_BOX=centos77/dev
278-
$M0VG env add M0_VM_BOX_URL="http://cortx-storage.colo.seagate.com/vagrant/centos77/dev"
277+
"$M0VG" env add M0_VM_BOX=centos77/dev
278+
"$M0VG" env add M0_VM_BOX_URL="http://cortx-storage.colo.seagate.com/vagrant/centos77/dev"
279279
}
280280

281281
edit_m0vg_params()
282282
{
283283
local FSTART=$(date +%s); local RESULT=0
284284
print_msg "Editing the m0vg params."
285-
$M0VG env add M0_VM_HOSTNAME_PREFIX=$CL_DIR_TAG
286-
$M0VG env add M0_VM_NAME_PREFIX=$CL_DIR_TAG
287-
$M0VG env add M0_VM_NFS_VERSION=3
288-
$M0VG env add M0_VM_CMU_MEM_MB=8384
289-
$M0VG env add M0_VM_CLIENT_NR=1
290-
$M0VG env add M0_VM_CLIENT_MEM_MB=2046
291-
$M0VG env add M0_VM_SSU_DISKS=6
292-
$M0VG env add M0_VM_SSU_DISK_SIZE_GB=2
285+
"$M0VG" env add M0_VM_HOSTNAME_PREFIX="$CL_DIR_TAG"
286+
"$M0VG" env add M0_VM_NAME_PREFIX="$CL_DIR_TAG"
287+
"$M0VG" env add M0_VM_NFS_VERSION=3
288+
"$M0VG" env add M0_VM_CMU_MEM_MB=8384
289+
"$M0VG" env add M0_VM_CLIENT_NR=1
290+
"$M0VG" env add M0_VM_CLIENT_MEM_MB=2046
291+
"$M0VG" env add M0_VM_SSU_DISKS=6
292+
"$M0VG" env add M0_VM_SSU_DISK_SIZE_GB=2
293293
# use_centos76
294294
use_centos77
295295
print_status_and_time $FSTART $RESULT
@@ -307,7 +307,7 @@ create_vms()
307307
read -t 30 CH
308308
if [ "$CH" != "4" ]; then
309309
print_msg "Creating only cmu !!!"
310-
$M0VG up cmu
310+
"$M0VG" up cmu
311311
RESULT=$?
312312
if [ $RESULT != 0 ]; then
313313
print_msg "IGNORED ERROR in creating cmu vm!!!"
@@ -316,7 +316,7 @@ create_vms()
316316
ALL_FOUR_VMS_CREATED="NO"
317317
else
318318
print_msg "Creating all 4 VMs (cmu, ssu1, ssu2, client1) !!!"
319-
$M0VG up cmu ssu1 ssu2 client1
319+
"$M0VG" up cmu ssu1 ssu2 client1
320320
RESULT=$?
321321
if [ $RESULT != 0 ]; then
322322
print_msg "IGNORED ERROR in creating cmu vm!!!"
@@ -339,7 +339,7 @@ create_cluster()
339339
print_msg "Using CL_DIR_PATH [$CL_DIR_PATH];"
340340

341341
cleanup_if_existing
342-
mkdir $CL_DIR_PATH; cd $CL_DIR_PATH
342+
mkdir "$CL_DIR_PATH"; cd "$CL_DIR_PATH"
343343

344344
clone_motr
345345
RESULT=$?
@@ -381,7 +381,7 @@ verify_mount()
381381
TEST_FILE_VM_PATH="/data/TEST_FILE"
382382
TEST_FILE_HOST_PATH="$CL_DIR_PATH/TEST_FILE"
383383

384-
$M0VG run --vm $VM "touch $TEST_FILE_VM_PATH"
384+
"$M0VG" run --vm "$VM" "touch $TEST_FILE_VM_PATH"
385385
RESULT=$?
386386
if [ $? = 0 ] && [ -f "$TEST_FILE_HOST_PATH" ]; then
387387
print_msg "Mount of /data is verified successfully for [$VM];"
@@ -392,8 +392,8 @@ verify_mount()
392392
"Will retry after 30 sec."
393393
read -t 30 a
394394
## CAREFUL -- We are making a recursive call here
395-
$M0VG reload $VM
396-
verify_mount $VM
395+
"$M0VG" reload "$VM"
396+
verify_mount "$VM"
397397
fi
398398
print_status_and_time $FSTART $RESULT
399399
return $RESULT
@@ -424,7 +424,7 @@ compile_install_motr()
424424
## COMPILATION OF MOTR
425425
M0C_START=$(date +%s)
426426
print_msg " COMPILATION OF MOTR STARTED!!! M0C_START [$M0C_START]!!!"
427-
$M0VG run --vm cmu $COMPILE_INSTALL_MOTR_SCRIPT
427+
"$M0VG" run --vm cmu "$COMPILE_INSTALL_MOTR_SCRIPT"
428428
RESULT=$?;
429429
FTIME=$(( $(date +%s) - $FSTART ))
430430
if [ $RESULT = 0 ]; then
@@ -441,7 +441,7 @@ compile_install_hare()
441441
## COMPILATION OF HARE
442442
H0C_START=$(date +%s)
443443
print_msg "COMPILATION OF HARE STARTED!!! H0C_START [$H0C_START]!!!"
444-
$M0VG run --vm cmu $COMPILE_INSTALL_HARE_SCRIPT
444+
"$M0VG" run --vm cmu "$COMPILE_INSTALL_HARE_SCRIPT"
445445
RESULT=$?;
446446
FTIME=$(( $(date +%s) - $FSTART ))
447447
if [ $RESULT = 0 ]; then
@@ -458,7 +458,7 @@ start_cluster()
458458
## Starting the cluster
459459
STCL_START=$(date +%s)
460460
print_msg "Starting the cluster !!!"
461-
$M0VG run --vm cmu $START_CLUSTER_SCRIPT
461+
"$M0VG" run --vm cmu "$START_CLUSTER_SCRIPT"
462462
RESULT=$?;
463463
FTIME=$(( $(date +%s) - $FSTART ))
464464
if [ $RESULT = 0 ]; then
@@ -475,7 +475,7 @@ run_tests()
475475
## Run tests
476476
print_msg "TESTS WILL BE EXEUTED FROM THE [$RUN_TESTS_SCRIPT]"
477477
print_msg "To add your own tests, append these to this file."
478-
$M0VG run --vm cmu $RUN_TESTS_SCRIPT
478+
"$M0VG" run --vm cmu "$RUN_TESTS_SCRIPT"
479479
RESULT=$?;
480480
FTIME=$(( $(date +%s) - $FSTART ))
481481
if [ $RESULT = 0 ]; then
@@ -491,17 +491,17 @@ reboot_cluster()
491491
{
492492
local FSTART=$(date +%s); local RESULT=0
493493
if [ "$ALL_FOUR_VMS_CREATED" == "YES" ]; then
494-
$M0VG reload cmu
495-
$M0VG reload ssu1
496-
$M0VG reload ssu2
497-
$M0VG reload client1
494+
"$M0VG" reload cmu
495+
"$M0VG" reload ssu1
496+
"$M0VG" reload ssu2
497+
"$M0VG" reload client1
498498
elif [ "$ALL_FOUR_VMS_CREATED" == "NO" ]; then
499-
$M0VG reload cmu
499+
"$M0VG" reload cmu
500500
else
501501
print_msg "Some thing has gone wrong with reboot of VMs."
502502
script_terminate -1
503503
fi
504-
vagrant global-status --prune | grep $CL_DIR_TAG
504+
vagrant global-status --prune | grep "$CL_DIR_TAG"
505505
print_msg "Now waiting for 120 secs for the machines to reboot."
506506
print_msg "Press ENTER to verify reboot now."
507507
read -t 120 a
@@ -547,7 +547,7 @@ print_msg "tests will be executed"
547547

548548
check_load_on_host
549549

550-
mkdir -p $CL_HOME; cd $CL_HOME
550+
mkdir -p "$CL_HOME"; cd "$CL_HOME"
551551

552552
create_cluster
553553
RESULT=$?

0 commit comments

Comments
 (0)