Merge pull request #4542 from AllskyTeam/Fix-addMessage.sh-count

Fix add message.sh count

Author: EricClaeys

html/index.php

@@ -400,7 +400,10 @@ function DisplayTorProxyConfig() {}
 									if ($date !== "")
 										$message .= "   ($date)";
 								} else {
-									$message .= "   ($count occurrences, last on $date)";
+									$message .= "   ($count occurrences";
+									if ($date !== "")
+										$message .= ", last on $date";
+									$message .= ")";
 								}
 							} else {
 								$level = "error";	// badly formed message

scripts/addMessage.sh

@@ -165,7 +165,7 @@ fi
 if [[ -f ${ALLSKY_MESSAGES} ]] &&  M="$( grep "${TAB}${ESCAPED_MESSAGE}${TAB}" "${ALLSKY_MESSAGES}" )" ; then
 	COUNT=0
 	# tail -1  in case file is corrupt and has more than one line we want.
-	PRIOR_COUNT=$( echo -e "${M}" | cut -f3 -d"${TAB}" | tail -1 )
+	PRIOR_COUNT=$( echo -e "${M}" | cut -f5 -d"${TAB}" | tail -1 )
 
 	# If this entry is corrupted don't try to update the counter.
 	[[ ${PRIOR_COUNT} != "" ]] && ((COUNT = PRIOR_COUNT + 1))

scripts/utilities/getNewestAllskyVersion.sh

@@ -37,7 +37,8 @@ if [[ ${CURRENT_VERSION} == "${NEWEST_VERSION}" ]]; then
 elif [[ ${CURRENT_VERSION} < "${NEWEST_VERSION}" ]]; then
 	RET="${EXIT_PARTIAL_OK}"
 else
-	RET=0		# Current newer than newest - this should not happen in normal use
+	# Current newer than newest - this can happen if testing a newer release.
+	RET=0
 fi
 
 echo "${NEWEST_VERSION}"