Skip to content

Commit 6f8ef0c

Browse files
authored
resolve more shellcheck errors
1 parent 0f2e32c commit 6f8ef0c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

yabs.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ function ip_info() {
331331
[[ -n $JSON ]] && JSON_RESULT+=',"ip_info":{"protocol":"'$net_type'","isp":"'$isp'","asn":"'$as'","org":"'$org'","city":"'$city'","region":"'$region'","region_code":"'$region_code'","country":"'$country'"}'
332332
}
333333

334-
if [ -n $JSON ]; then
334+
if [[ -n $JSON ]]; then
335335
UPTIME_S=$(awk '{print $1}' /proc/uptime)
336336
IPV4=$([ -n "$IPV4_CHECK" ] && echo "true" || echo "false")
337337
IPV6=$([ -n "$IPV6_CHECK" ] && echo "true" || echo "false")
@@ -544,7 +544,7 @@ elif [ -z "$SKIP_FIO" ]; then
544544

545545
long=""
546546
m=-1
547-
for x in ${poss[@]}
547+
for x in "${poss[@]}"
548548
do
549549
if [ ${#x} -gt $m ];then
550550
m=${#x}
@@ -661,7 +661,7 @@ elif [ -z "$SKIP_FIO" ]; then
661661
printf "%-10s | %-11s %8s | %-11s %8s\n" "Read" "${DISK_RESULTS[DISK_COUNT*6+1]}" "(${DISK_RESULTS[DISK_COUNT*6+4]})" "${DISK_RESULTS[(DISK_COUNT+1)*6+1]}" "(${DISK_RESULTS[(DISK_COUNT+1)*6+4]})"
662662
printf "%-10s | %-11s %8s | %-11s %8s\n" "Write" "${DISK_RESULTS[DISK_COUNT*6+2]}" "(${DISK_RESULTS[DISK_COUNT*6+5]})" "${DISK_RESULTS[(DISK_COUNT+1)*6+2]}" "(${DISK_RESULTS[(DISK_COUNT+1)*6+5]})"
663663
printf "%-10s | %-11s %8s | %-11s %8s\n" "Total" "${DISK_RESULTS[DISK_COUNT*6]}" "(${DISK_RESULTS[DISK_COUNT*6+3]})" "${DISK_RESULTS[(DISK_COUNT+1)*6]}" "(${DISK_RESULTS[(DISK_COUNT+1)*6+3]})"
664-
if [ -n $JSON ]; then
664+
if [[ -n $JSON ]]; then
665665
JSON_RESULT+='{"bs":"'${BLOCK_SIZES[DISK_COUNT]}'","speed_r":'${DISK_RESULTS_RAW[DISK_COUNT*6+1]}',"iops_r":'${DISK_RESULTS_RAW[DISK_COUNT*6+4]}
666666
JSON_RESULT+=',"speed_w":'${DISK_RESULTS_RAW[DISK_COUNT*6+2]}',"iops_w":'${DISK_RESULTS_RAW[DISK_COUNT*6+5]}',"speed_rw":'${DISK_RESULTS_RAW[DISK_COUNT*6]}
667667
JSON_RESULT+=',"iops_rw":'${DISK_RESULTS_RAW[DISK_COUNT*6+3]}',"speed_units":"KBps"},'
@@ -786,7 +786,7 @@ function launch_iperf {
786786
[[ -z $IPERF_RECVRESULT_VAL || "$IPERF_RECVRESULT_VAL" == *"0.00"* ]] && IPERF_RECVRESULT_VAL="busy" && IPERF_RECVRESULT_UNIT=""
787787
# print the speed results for the iperf location currently being evaluated
788788
printf "%-15s | %-25s | %-15s | %-15s | %-15s\n" "${IPERF_LOCS[i*5+2]}" "${IPERF_LOCS[i*5+3]}" "$IPERF_SENDRESULT_VAL $IPERF_SENDRESULT_UNIT" "$IPERF_RECVRESULT_VAL $IPERF_RECVRESULT_UNIT" "$LATENCY_VAL"
789-
if [ -n $JSON ]; then
789+
if [[ -n $JSON ]]; then
790790
JSON_RESULT+='{"mode":"'$MODE'","provider":"'${IPERF_LOCS[i*5+2]}'","loc":"'${IPERF_LOCS[i*5+3]}
791791
JSON_RESULT+='","send":"'$IPERF_SENDRESULT_VAL' '$IPERF_SENDRESULT_UNIT'","recv":"'$IPERF_RECVRESULT_VAL' '$IPERF_RECVRESULT_UNIT'","latency":"'$LATENCY_VAL'"},'
792792
fi
@@ -829,7 +829,7 @@ if [ -z "$SKIP_IPERF" ]; then
829829
IPERF_LOCS=( \
830830
"lon.speedtest.clouvider.net" "5200-5209" "Clouvider" "London, UK (10G)" "IPv4|IPv6" \
831831
"iperf-ams-nl.eranium.net" "5201-5210" "Eranium" "Amsterdam, NL (100G)" "IPv4|IPv6" \
832-
#"speedtest.extra.telia.fi" "5201-5208" "Telia" "Helsinki, FI (10G)" "IPv4" \
832+
#"speedtest.extra.telia.fi" "5201-5208" "Telia" "Helsinki, FI (10G)" "IPv4"
833833
# AFR placeholder
834834
"speedtest.uztelecom.uz" "5200-5209" "Uztelecom" "Tashkent, UZ (10G)" "IPv4|IPv6" \
835835
"speedtest.sin1.sg.leaseweb.net" "5201-5210" "Leaseweb" "Singapore, SG (10G)" "IPv4|IPv6" \
@@ -965,7 +965,7 @@ function launch_geekbench {
965965
printf "%-15s | %-30s\n" "Multi Core" "$GEEKBENCH_SCORES_MULTI"
966966
printf "%-15s | %-30s\n" "Full Test" "$GEEKBENCH_URL"
967967

968-
if [ -n $JSON ]; then
968+
if [[ -n $JSON ]]; then
969969
JSON_RESULT+='{"version":'$VERSION',"single":'$GEEKBENCH_SCORES_SINGLE',"multi":'$GEEKBENCH_SCORES_MULTI
970970
JSON_RESULT+=',"url":"'$GEEKBENCH_URL'"},'
971971
fi

0 commit comments

Comments
 (0)