diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report index 0c4e7c5a02..2b7870e730 100755 --- a/.meta/dietpi-survey_report +++ b/.meta/dietpi-survey_report @@ -791,7 +791,7 @@ shopt -s extglob eval "software=\${aSOFTWARE_NAME${version/./_}[$software]}" if [[ ! $software ]] then - echo "Invalid software ID for DietPi version $version" + echo "Invalid software ID \"$software\" for DietPi version $version" mv -v "/home/dietpi-survey/survey/$file" /home/dietpi-survey/invalid/ return 1 fi @@ -1005,9 +1005,12 @@ shopt -s extglob # Work out averages # - Divide CPU times by 100 and scale to revert decimal point removal - aBENCH_RESULT_CPU_MIN[i]=$(printf '%.2f' "${aBENCH_RESULT_CPU_MIN[i]}e-2") - aBENCH_RESULT_CPU_MAX[i]=$(printf '%.2f' "${aBENCH_RESULT_CPU_MAX[i]}e-2") - aBENCH_RESULT_CPU_AVG[i]=$(printf '%.2f' "$((${aBENCH_RESULT_CPU_AVG[i]}*10/${aBENCH_CPU_INDEX[i]}+1))e-3") + #aBENCH_RESULT_CPU_MIN[i]=$(printf '%.2f' "${aBENCH_RESULT_CPU_MIN[i]}e-2") + #aBENCH_RESULT_CPU_MAX[i]=$(printf '%.2f' "${aBENCH_RESULT_CPU_MAX[i]}e-2") + #aBENCH_RESULT_CPU_AVG[i]=$(printf '%.2f' "$((${aBENCH_RESULT_CPU_AVG[i]}*10/${aBENCH_CPU_INDEX[i]}+1))e-3") + aBENCH_RESULT_CPU_MIN[i]=$(mawk "{printf \"%.2f\", ${aBENCH_RESULT_CPU_MIN[i]}e-2}" <<< '') + aBENCH_RESULT_CPU_MAX[i]=$(mawk "{printf \"%.2f\", ${aBENCH_RESULT_CPU_MAX[i]}e-2}" <<< '') + aBENCH_RESULT_CPU_AVG[i]=$(mawk "{printf \"%.2f\", $((${aBENCH_RESULT_CPU_AVG[i]}*10/${aBENCH_CPU_INDEX[i]}+1))e-3}" <<< '') # CPU temps if available aBENCH_RESULT_CPU_TEMP_START_MIN[i]='N/A'