[2023-05-06] touch_grass

[Blog] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 91854b9291e66685c3e22c606635e4e558afe3ed..54916363b1cd835762ade7215ee636d341ea0cc9 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,9 +6,6 @@ SHELL = /bin/sh
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-BEORN_VERSION = 0.1.0
-BEORN = https://git.ladys.computer/Beorn/blob_plain/$(BEORN_VERSION):/build.js
-
 # This Makefile requires rsync 3 or newer.
 RSYNC = rsync
 RSYNC_FLAGS = -Oclmrtvz
@@ -29,8 +26,10 @@ DESTINATION_HOST = computer
 DESTINATION_PATH = lady/blog
 DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH)
 
+GIT_FORCE =
+
 build:
-       deno run --allow-read=. --allow-write=. $(BEORN)
+       deno run --allow-read=. --allow-write=. ./build.js
        touch .grass
 
 ensure-build:
@@ -43,13 +42,12 @@ ensure-branch-up-to-date:
 
 ensure-clean:
        @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi
-       @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi
 
-dry-sync: ensure-clean ensure-branch-up-to-date ensure-build
+dry-sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build
        $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
 
-sync: ensure-clean ensure-branch-up-to-date ensure-build
+sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build
        $(RSYNC) $(RSYNC_FLAGS) --del --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
-       git push --force
+       git push$(if $(GIT_FORCE), --force,)
 
 .PHONY: build dry-sync ensure-branch-up-to-date ensure-build ensure-clean sync;