Drop Nextcloud sync client commands, let DAVFS handle this

parent 8046db77
......@@ -7,7 +7,6 @@ GITNAME := $(notdir $(shell git worktree list | head -n1 | awk '{print $$1}'))
PROJECT ?= $(GITNAME)
PUBLISHERDIR ?= $(AVADANLIKDIR)
NEXTCLOUD ?= https://nextcloud.alerque.com/remote.php/webdav/viachristus/$(PROJECT)
OUTPUTDIR ?= ${HOME}/Nextcloud/viachristus/$(PROJECT)
INPUTDIR ?= $(OUTPUTDIR)
......@@ -132,7 +131,6 @@ debug: debug_avadanlik
debug_avadanlik:
@echo AVADANLIKDIR: $(AVADANLIKDIR)
@echo BRANCH: $(BRANCH)
@echo NEXTCLOUD: $(NEXTCLOUD)
@echo TAGNAME: $(TAGNAME)
@echo OUTPATHS: $(OUTPATHS)
......@@ -141,7 +139,6 @@ check_dependencies: check_dependencies_avadanlik
.PHONY: check_dependencies_avadanlik
check_dependencies_avadanlik:
hash rsync
hash nextcloudcmd
.avadanlik.lua:
cat <<- EOF > $@
......@@ -190,17 +187,8 @@ define ci_setup ?=
'. + ($$sources | [splits(" ") as $$target | { ($$target + ".pdfs") : { "extends": ".pdfs", "only": [ "master", ("/^"+$$target+"\\/.*/") ], "artifacts": { "paths": [($$target+"*")] } }}]) | add'
endef
pre_sync = $(sync_nextcloud)
post_sync = $(sync_nextcloud)
define sync_nextcloud =
-pgrep -u $(USER) -x nextcloud || \
nextcloudcmd -n -s $(OUTPUTDIR) $(NEXTCLOUD) 2>/dev/null
endef
.PHONY: sync_pre
sync_pre: | $(require_pubdir) $(require_outputdir)
$(call pre_sync)
$(and $(INPUTDIR),rsync -utv $(INPUTDIR)/* $(PROJECTDIR)/ ||:)
$(and $(INPUTDIR),$(foreach TARGET,$(TARGETS),rsync -utv $(INPUTDIR)/$(TARGET)/* $(PROJECTDIR)/ ||:;))
......@@ -217,7 +205,6 @@ ifneq ($(strip $(TARGETS)),$(strip $(PROJECT)))
-name "$(PROJECT)*" \
-execdir rsync -ct {} $(OUTPUTDIR)/ \;
endif
$(call post_sync)
.PHONY: website
website:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment