diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 123957fe..c33e9048 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -217,19 +217,19 @@ CHECKTEMP(){ if [ ${DETAILS} -eq 1 ]; then for M in 15 30 60 120; do OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) - ([ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]) && echo -en "${idsCL[White]}| " || echo -en " " - [ ${#M} -eq 2 ] && echo -en " " + ([ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]) && echo -en "${idsCL[White]}| " || echo -n " " + [ ${#M} -eq 2 ] && echo -n " " echo -e "${idsCL[White]} ${idsCL[Default]}${M} Mins Ago ${idsCL[Default]}${temp_f_disp}${GAUGESH}" done - [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -en " " + [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -n " " echo -e "${idsCL[White]} ${idsCL[Default]} 15 Mins Ago ${idsCL[Default]}${temp_f_disp}${GAUGESH}" - [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -en " " + [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -n " " echo -e "${idsCL[White]} ${idsCL[Default]} 30 Mins Ago ${idsCL[Default]}${temp_f_disp}${GAUGESH}" - [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -en " " + [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -n " " echo -e "${idsCL[White]} ${idsCL[Default]} 60 Mins Ago ${idsCL[Default]}${temp_f_disp}${GAUGESH}" - [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -en " " + [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ] && echo -en "${idsCL[White]}| " || echo -n " " echo -e "${idsCL[White]} ${idsCL[Default]}120 Mins Ago 5 ${idsCL[Default]}${temp_f_disp}${GAUGESH}" fi