Fix problem with cron frequency introduced with 682960d450

README.md

@@ -31,6 +31,10 @@ If you specify a SSH URL (`ssh:// ...`) for your repository, the host key will b
 
 If you want to pull private repositories, you may need to generate a SSH key for this purpose, and hand in the private key file, e.g. via `-v ./id_rsa:/root/.ssh/id_rsa`.
 
+#### Specify branch
+
+If there is a specific branch to use (other than [master/main](https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/)), you can specify the desired branch using the `REPO_BRANCH` environment variable.
+
 ### Passthrough via Bind
 
 To just use a specific directory as the hugo blog contents, run the container with the repository passed through as bind directory:

aux/pull-n-build.sh

@@ -15,12 +15,22 @@ set -e -v
 		true
 	else
 		# repo URL set
+		if [ -d /repo ]; then
+			# repo already exists, try to pull
+			cd /repo && git pull --recurse-submodules
+			if [ "$?" -ne 0 ]; then
+				# pull failed, clean and retry to clone
+				echo "Pull failed, attempting to clean clone"
+				rm -rf /repo
+			fi
+		fi
 		if [ ! -d /repo ]; then
 			# repo needs to be cloned
-			git clone --recurse-submodules $REPO_URL /repo
+			# check if there is a specific branch to clone
-		else
+			if [ ! "$REPO_BRANCH" == "" ]; then
-			# no - pull existing repo
+				BRANCHCMD="--branch $REPO_BRANCH"
-			cd /repo && git pull --recurse-submodules
+			fi
+			git clone --recurse-submodules $BRANCHCMD $REPO_URL /repo
 		fi
 	fi
 

init/cron.sh

@@ -9,7 +9,9 @@ if [ "$BUILDFREQ" == "" ]; then
 fi
 
 # Run the pull script regularly
-echo "$BUILDFREQ * * * * /aux/pull-n-build.sh" >> /var/spool/cron/crontabs/root
+target="/aux/pull-n-build.sh"
+entry="*/$BUILDFREQ * * * * $target"
+grep "$target" /var/spool/cron/crontabs/root || echo "$entry" >> /var/spool/cron/crontabs/root
 
 # start cron daemon (goes into background)
 crond