Mirrors/yet-another-bench-script
1
0
Fork 0
mirror of https://github.com/masonr/yet-another-bench-script.git synced 2025-04-19 00:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix shellcheck findings

Browse Source
This commit is contained in:
Mason Rowe 2024-12-20 00:58:34 -05:00 committed by GitHub
parent a38f473f8e
commit 4760cf8ee6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yabs.sh
View File

@ -673,7 +673,7 @@ elif [ -z "$SKIP_FIO" ]; then
JSON_RESULT+=',"speed_w":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6+2]}',"iops_w":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6+5]}',"speed_rw":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6]} JSON_RESULT+=',"speed_w":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6+2]}',"iops_w":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6+5]}',"speed_rw":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6]}
JSON_RESULT+=',"iops_rw":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6+3]}',"speed_units":"KBps"},' JSON_RESULT+=',"iops_rw":'${DISK_RESULTS_RAW[(DISK_COUNT+1)*6+3]}',"speed_units":"KBps"},'
fi fi
DISK_COUNT=$(($DISK_COUNT + 2)) DISK_COUNT=$((DISK_COUNT + 2))
done done
[[ -n $JSON ]] && JSON_RESULT=${JSON_RESULT::${#JSON_RESULT}-1} && JSON_RESULT+=']' [[ -n $JSON ]] && JSON_RESULT=${JSON_RESULT::${#JSON_RESULT}-1} && JSON_RESULT+=']'
fi fi
@ -982,7 +982,7 @@ function launch_geekbench {
# if the skip geekbench flag was set, skip the system performance test, otherwise test system performance # if the skip geekbench flag was set, skip the system performance test, otherwise test system performance
if [ -z "$SKIP_GEEKBENCH" ]; then if [ -z "$SKIP_GEEKBENCH" ]; then
[[ -n $JSON ]] && JSON_RESULT+=(",\"geekbench\":[") [[ -n $JSON ]] && JSON_RESULT+=",\"geekbench\":["
if [[ $GEEKBENCH_4 == *True* ]]; then if [[ $GEEKBENCH_4 == *True* ]]; then
launch_geekbench 4 launch_geekbench 4
fi fi
@ -994,8 +994,8 @@ if [ -z "$SKIP_GEEKBENCH" ]; then
if [[ $GEEKBENCH_6 == *True* ]]; then if [[ $GEEKBENCH_6 == *True* ]]; then
launch_geekbench 6 launch_geekbench 6
fi fi
[[ -n $JSON ]] && [[ "${JSON_RESULT: -1}" == ',' ]] && JSON_RESULT=$(echo "$JSON_RESULT" | sed 's/,$//') [[ -n $JSON ]] && [[ "${JSON_RESULT: -1}" == ',' ]] && JSON_RESULT="${JSON_RESULT%,}"
[[ -n $JSON ]] && JSON_RESULT+=']' [[ -n $JSON ]] && JSON_RESULT+="]"
fi fi
# finished all tests, clean up all YABS files and exit # finished all tests, clean up all YABS files and exit
@ -1021,13 +1021,13 @@ function calculate_time_taken() {
else else
echo "YABS completed in ${time_taken} sec" echo "YABS completed in ${time_taken} sec"
fi fi
[[ -n $JSON ]] && JSON_RESULT+=',"runtime":{"start":'$start_time',"end":'$end_time',"elapsed":'$time_taken'}' [[ -n $JSON ]] && JSON_RESULT+=",\"runtime\":{\"start\":'$start_time',\"end\":'$end_time',\"elapsed\":'$time_taken'}"
} }
calculate_time_taken "$YABS_END_TIME" "$YABS_START_TIME" calculate_time_taken "$YABS_END_TIME" "$YABS_START_TIME"
if [[ -n $JSON ]]; then if [[ -n $JSON ]]; then
JSON_RESULT+='}' JSON_RESULT+="}"
# write json results to file # write json results to file
if [[ $JSON = *w* ]]; then if [[ $JSON = *w* ]]; then