Use 👥📤 Yseme for syncing

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..a7050fe
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Yseme"]
+       path = .👥📤
+       url = https://git.ladys.computer/Yseme.git

diff --git a/.ð\9f\91¥ð\9f\93¤ b/.ð\9f\91¥ð\9f\93¤
new file mode 160000 (submodule)
index 0000000..f6ab022
--- /dev/null
+++ b/.ð\9f\91¥ð\9f\93¤
@@ -0,0 +1 @@
+Subproject commit f6ab0225fdd5a404fbd592b0d5c051f0cbea4135

diff --git a/GNUmakefile b/GNUmakefile
index 48cca5911be37bb5fb2829dcc289fca90fb6ba76..ee2f301600d0d1aba9aa936d7661277cc86f451c 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,40 +1,16 @@
 SHELL = /bin/sh
 
 SHELL = /bin/sh
 

-# This Makefile requires rsync 3 or newer.
-RSYNC = rsync
-RSYNC_FLAGS = -Oclmrtvz
-RSYNC_OPTIONS =
-RSYNC_FILTER = .rsync-filter
-
-SOURCE_CHARSET = utf-8-mac
-
-DESTINATION_HOST = computer
-DESTINATION_PATH = lady/langdev
-DESTINATION = $(DESTINATION_HOST):$(DESTINATION_PATH)
-DESTINATION_CHARSET = utf-8
-
-GIT_FORCE =
+YSEME := .👥📤
+YSEMEOPTS := DESTDIR='public' SERVERPATH='lady/langdev'

 
 build:
 # Put any necessary build scripts in here!
        touch .grass
 
 
 build:
 # Put any necessary build scripts in here!
        touch .grass
 

-ensure-build:
-       @if [ ! -f .grass ]; then echo 'Error: The website has not been built yet!' >&2; echo 'Run `make` before syncing.' >&2; exit 1; fi
-       @if buildtime=$$(stat -f '%m' .grass) && committime=$$(git log -1 --format='%ct' | awk '{print $$NF}') && [ "$$committime" -gt "$$buildtime" ]; then echo 'Error: A commit was made after the last build!' >&2; echo 'Run `make` before syncing.' >&2; exit 1; fi
-
-ensure-branch-up-to-date:
-       git fetch
-       @if ! git merge-base --is-ancestor @{u} HEAD; then echo 'Error: This branch is currently out‐of‐date!' >&2; echo 'Pull in changes with `git pull` before syncing.' >&2; exit 1; fi
-
-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
-
-dry-sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build
-       cd public && $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". ../$(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
+$(YSEME)/GNUmakefile:
+       git submodule update --init $(YSEME)

 
 

-sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build
-       cd public && $(RSYNC) $(RSYNC_FLAGS) --del --filter=". ../$(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION)
-       git push$(if $(GIT_FORCE), --force,)
+dry-sync sync:
+       $(MAKE) -f $(YSEME)/GNUmakefile $@ $(YSEMEOPTS)

 
 

-.PHONY: build dry-sync ensure-branch-up-to-date ensure-build ensure-clean sync;
+.PHONY: build dry-sync sync;