From 4ca8a8ae0204a0e3570e10179bb064e458ad2f40 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Mon, 16 Jun 2025 14:23:57 -0600
Subject: [PATCH] Update comments, rearrange file, fix case statement and
 handle empty parameter correctly.

---
 Config/Nextcloud/cron.sh | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/Config/Nextcloud/cron.sh b/Config/Nextcloud/cron.sh
index 8672ca0..22ae29d 100755
--- a/Config/Nextcloud/cron.sh
+++ b/Config/Nextcloud/cron.sh
@@ -19,32 +19,44 @@ if (( $RUNNING > 0 )); then
 	exit $RUNNING
 fi
 
+function usage() {
+	cat <<- EOF
+		Script to help with scheduling Nextcloud's cron requirements.
+		Usage: $PROG [-h|-v]
+			-h) Display the usage and help text.
+			-v) Pass a verbose request to cron.php.
+	EOF
+	exit $1
+}
+
 verbose=""
 case "$1" in
+	"") ;;
 	"-h")
-		cat <<- EOF
-			Script to help with scheduling Nextcloud's cron requirements.
-			Usage: $PROG [-h|-v]
-				-h) Display the usage and help text.
-				-v) Pass a verbose request to cron.php.
-		EOF
-		exit 0
+		usage 0
 		;;
 	"-v")
 		verbose="-v"
 		;;
 	*)
-		echo "ERROR: Unknown parameter '$1', exiting."
-		$DIR/$PROG -h
+		echo -e "ERROR: Unknown parameter '$1'. Exiting.\n"
+		usage 1
 		;;
 esac
 
-# 2023-08-25 From crontab.
+# Keep ownership correct and apps up to date. Also exists in fixes.sh.
+sh -c "docker exec -i nc-app chown -Rc www-data:www-data ."
+# No longer update apps in advance of NC updates, allow the upgrade process to do it.
+#sh -c "docker exec -itu www-data nc-app ./occ app:update --all"
+
+# Prepare the variables being passed to the execution command.
 if [[ -f $DIR/.env ]]; then
 	source $DIR/.env
 else
 	PHP_MEMORY_LIMIT=256M
 fi
+
+# Main part of what would go in the crontab.
 sh -c "
 	docker exec nc-app \
 	sudo -u www-data \
@@ -54,9 +66,4 @@ sh -c "
 	-f cron.php $verbose \
 "
 
-# 2023-08-25 From fixes.sh, keep ownership correct and apps up to date.
-sh -c "docker exec -i nc-app chown -Rc www-data:www-data ."
-# No longer update apps in advance of NC updates, allow the upgrade process to do it.
-#sh -c "docker exec -itu www-data nc-app ./occ app:update --all"
-
 exit 0