Changes to checkchangelog function

* Modify checkchangelog() function to only check CHECKSUMS.md5.asc.
* Remove unneeded check of ChangeLog.txt from checkchangelog() function.
* Move fetching of ChangeLog.txt to updatefilelists() function.
* Modify check-updates to output need to update to stderr so cron
  jobs will notify sysadmin.

Signed-off-by: Robby Workman <rworkman@slackware.com>

2 files changed, 22 insertions, 30 deletions

diff --git a/files/core-functions.sh b/files/core-functions.sh
index aa12743..c2891f5 100644
--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -985,6 +985,7 @@ function getpkg() {
 
 # Main logic to download and format package list, md5 etc.
 #
+# Check if anything has changed. If so, return 1, else 0 if no change.
 function checkchangelog()
 {
 	if ! [ -e ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc ]; then
@@ -997,8 +998,7 @@ function checkchangelog()
 
 	# First we will download CHECKSUMS.md5.asc since it is a very small
 	# file and if it has not changed, we can know that the ChangeLog
-	# has not changed either. If it _has_ changed, we'll need to pull
-	# the ChangeLog to check that as well.
+	# has not changed either.
 	echo -e "\tDownloading..."
 	getfile ${SOURCE}CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc
 	if ! grep -q "PGP" $TMPDIR/CHECKSUMS.md5.asc ; then
@@ -1008,30 +1008,6 @@ Please check your mirror and try again."
 		cleanup
 	fi
 	if diff --brief ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ; then
-		# Before returning with the result that these signatures (and
-		# therefore the ChangeLog) are the same, we need to copy the
-		# ChangeLog into ${TMPDIR} in case the user decides to
-		# "download all other files":
-		cp ${ROOT}/${WORKDIR}/ChangeLog.txt $TMPDIR/ChangeLog.txt
-		return 0
-	fi
-	# CHECKSUMS.md5.asc was different, so we'll go on to download and test
-	# the full ChangeLog.txt.
-
-	echo -e "\tDownloading..."
-	#
-	# Download ChangeLog.txt first of all and test if it's equal
-	# or different from our already existent ChangeLog.txt 
-	#
-	getfile ${SOURCE}ChangeLog.txt $TMPDIR/ChangeLog.txt
-	if ! grep -q "[a-z]" $TMPDIR/ChangeLog.txt ; then
-		echo -e "\
-\nError downloading from $SOURCE.\n\
-Please check your mirror and try again."
-		cleanup
-	fi
-
-	if diff --brief ${ROOT}/${WORKDIR}/ChangeLog.txt $TMPDIR/ChangeLog.txt ; then
 		return 0
 	else
 		return 1
@@ -1050,8 +1026,17 @@ function updatefilelists()
 		fi
 	fi
 	echo
-	cp ${TMPDIR}/ChangeLog.txt ${ROOT}/${WORKDIR}/ChangeLog.txt
-
+	#
+	# Download ChangeLog.txt first
+	#
+	echo -e "\tDownloading..."
+	getfile ${SOURCE}ChangeLog.txt $TMPDIR/ChangeLog.txt
+	if ! grep -q "[a-z]" $TMPDIR/ChangeLog.txt ; then
+		echo -e "\
+\nError downloading from $SOURCE.\n\
+Please check your mirror and try again."
+		cleanup
+	fi
 	#
 	# Download MANIFEST, FILELIST.TXT and CHECKSUMS.md5
 	#
@@ -1205,6 +1190,11 @@ function updatefilelists()
 		cp $TMPDIR/CHECKSUMS.md5.asc \
 			${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc 2>/dev/null
 	fi
+	# Finally, copy ChangeLog.txt
+	if [ -e $TMPDIR/ChangeLog.txt ]; then
+		cp $TMPDIR/ChangeLog.txt \
+			${ROOT}/${WORKDIR}/ChangeLog.txt 2>/dev/null
+	fi
 }
 
 function sanity_check() {
diff --git a/files/slackpkg b/files/slackpkg
index 52f8c9b..f579ea3 100644
--- a/files/slackpkg
+++ b/files/slackpkg
@@ -318,10 +318,12 @@ case "$CMD" in
 		full_usage
 		;;
 	check-updates)
+		# output to stdout if no change, or stderr if changes. Will cause
+		# cron jobs to notify system admin
 		if checkchangelog 1>/dev/null 2>/dev/null ; then
-			echo "No updated packages since last check."
+			echo "Slackpkg: No updated packages since last check."
 		else
-			echo "Updated packages are available since last check."
+			echo "Slackpkg: Updated packages are available since last check." >&2
 		fi
 		;;
 	update)