commit 54ff8574f50c378b535e9a1a7bdab7950b473262 parent 63d69fa5922c1121bc70492293299a4400306fc4 Author: JayVii <jayvii[AT]posteo[DOT]de> Date: Sun, 9 Feb 2025 12:26:00 +0100 fix: ensure variables are set Diffstat:
| M | activity.sh | | | 12 | ++++++------ |
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/activity.sh b/activity.sh @@ -71,6 +71,7 @@ MAX_TIME=$(date +%Y-%m -d "next month") # get value range MIN_VAL=0 MAX_VAL=$(echo "$AGGREGATE" | awk '{ print $1 }' | sort -n | tail -n 1) +if [ ! -z $MAX_VAL ]; then MAX_VAL=1; fi # Generate output -------------------------------------------------------------- @@ -81,19 +82,18 @@ HTML="<h6>Activity: ${MIN_TIME_PRETTY} - ${MAX_TIME_PRETTY}</h6>" # cycle through months from earliest timepoint CUR_TIME=$MIN_TIME -while [ "$CUR_TIME" != "$MAX_TIME" ]; do +while [ $CUR_TIME != $MAX_TIME ]; do # fetch current value CUR_VAL=$(echo "$AGGREGATE" | grep $CUR_TIME | awk '{ print $1 }') + if [ -z $CUR_VAL ]; then CUR_VAL=0; fi # normalise current value [0, 100] - NRM_VAL=$(echo "${CUR_VAL:-0} * 100 / ${MAX_VAL:-1}" | bc) - - # list data in variable - # DATA+="$CUR_TIME ${CUR_VAL:-0} ${NRM_VAL:-5}\n" + NRM_VAL=$(echo "${CUR_VAL} * 100 / ${MAX_VAL}" | bc) + if [ -z $NRM_VAL ]; then NRM_VAL=0; fi # output HTML - HTML=${HTML}$(html_output "$CUR_TIME" ${CUR_VAL:-0} ${NRM_VAL:-0}) + HTML=${HTML}$(html_output "$CUR_TIME" "$CUR_VAL" "$NRM_VAL") # update current time CUR_TIME=$(date --date "${CUR_TIME}-01 +1 month" +%Y-%m)