X-Git-Url: https://git.ladys.computer/Blog/blobdiff_plain/507ea96ce3133bb0233c16d8fe5ec272b4bf9ddf..798cd431a91f1d8ddbc672e33c78a28da018c2cf:/GNUmakefile?ds=inline diff --git a/GNUmakefile b/GNUmakefile index 3095070..f97f746 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,33 +6,23 @@ 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 +RSYNC_FLAGS = --verbose --checksum --recursive --links --times --omit-dir-times --del --prune-empty-dirs --compress RSYNC_OPTIONS = RSYNC_FILTER = .rsync-filter SOURCE_CHARSET = utf-8-mac -DESTINATION_HOST = computer -DESTINATION_PATH = lady/www -DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH) -DESTINATION_CHARSET = utf-8 - -RSYNC_OPTIONS = -SOURCE_CHARSET = utf-8-mac -DESTINATION_CHARSET = utf-8 DESTINATION_HOST = computer DESTINATION_PATH = lady/blog DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH) +DESTINATION_CHARSET = utf-8 GIT_FORCE = build: - deno run --allow-read=. --allow-write=. $(BEORN) + deno run --allow-read=. --allow-write=. ./build.js touch .grass ensure-build: @@ -45,7 +35,6 @@ 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$(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)