diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..1aa7007d --- /dev/null +++ b/Makefile @@ -0,0 +1,34 @@ +SHELL := bash +.SHELLFLAGS := -eu -o pipefail -c +.DELETE_ON_ERROR: +MAKEFLAGS += --warn-undefined-variables +MAKEFLAGS += --no-builtin-rules + +ifeq ($(origin .RECIPEPREFIX), undefined) + $(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later) +endif +.RECIPEPREFIX = > + +## server: run server locally on port 1313 +server: +> hugo server -D + +## deploy: deploy the website to github pages +deploy: +> @echo -e "\033[0;32mDeploying updates to GitHub...\033[0m" +> hugo -t xmin +> cd public || exit; \ + git add .; \ + msg="rebuilding site $$(date)"; \ + git commit -m "$$msg"; \ + git push origin main; \ + cd .. || exit; + +## help: Print this help message +help: +> @echo +> @echo "Usage:" +> @echo +> @sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' | sed -e 's/^/ /' | sort +> @echo +.PHONY: help diff --git a/README.md b/README.md index c1e3c0aa..ee2fe5f7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ -# hugo-blog - -Hugo source for davegallant.github.io. +# blog +Source for https://davegallant.github.io. ## Deploy +Requires hugo. + ```shell -./deploy.sh +make deploy ``` diff --git a/config.toml b/config.toml index 674b51b9..1a0c28ea 100644 --- a/config.toml +++ b/config.toml @@ -37,4 +37,4 @@ canonifyURLs = true [params] description = "A website built through Hugo and blogdown." - footer = "© Dave Gallant 2020 | [Github](https://github.com/davegallant) | [Twitter](https://twitter.com/dgallant0)" + footer = "© Dave Gallant 2021 | [Github](https://github.com/davegallant) | [Twitter](https://twitter.com/Dave_Gallant_)" diff --git a/content/post/appgate-sdp-on-arch-linux.md b/content/post/appgate-sdp-on-arch-linux.md index 38dd06e3..000c9da7 100644 --- a/content/post/appgate-sdp-on-arch-linux.md +++ b/content/post/appgate-sdp-on-arch-linux.md @@ -155,5 +155,3 @@ The docs that say `Deprecated since version 3.5, will be removed in version 3.8: I guess this highlights one of the caveats of relying upon system python. -Enjoy. - diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 6e715045..00000000 --- a/deploy.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -echo -e "\033[0;32mDeploying updates to GitHub...\033[0m" - -# Build the project. -hugo -t xmin - -# Go To Public folder -cd public -# Add changes to git. -git add . - -# Commit changes. -msg="rebuilding site `date`" -if [ $# -eq 1 ] - then msg="$1" -fi -git commit -m "$msg" - -# Push source and build repos. -git push origin master - -# Come Back up to the Project Root -cd .. diff --git a/public b/public index adb9c9cc..c6d614fc 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit adb9c9cce01b9e557778f3518ae80d1d28a63a15 +Subproject commit c6d614fc82e270bcc72f0bee31ab11277bc2bb82