Compare commits

...

2 Commits

Author SHA1 Message Date
joeac 512f130117 Fix error log in capsule/build_microlog.bash 2026-05-08 20:41:32 +01:00
joeac 0ca370c285 fix capsule Makefile 2026-05-08 20:40:52 +01:00
2 changed files with 16 additions and 6 deletions
+15 -5
View File
@@ -5,20 +5,30 @@ LONGLOG_HEADER := $(TEMPLATES_DIR)/longlog-header.gmi
LOGLOG_HEADER := $(TEMPLATES_DIR)/loglog-header.gmi LOGLOG_HEADER := $(TEMPLATES_DIR)/loglog-header.gmi
MICROLOG_ENTRIES := $(wildcard microlog/*) MICROLOG_ENTRIES := $(wildcard microlog/*)
LONGLOG_ENTRIES := $(wildcard content/logs/longlog/*) LONGLOG_ENTRIES := $(wildcard content/logs/longlog/*)
LOGLOG_TARGET := content/logs/loglog.gmi
FEED_TARGET := $(COMITIUM_DATA)/subscriptions.json $(COMITIUM_DATA)/feed.gmi $(COMITIUM_DATA)/subscriptions.gmi
FEED_OUTPUTS := $(FEED_TARGET) $(COMITIUM_DATA)/subscriptions.json $(COMITIUM_DATA)/feed.gmi $(COMITIUM_DATA)/subscriptions.gmi
MICROLOG_TARGET := content/logs/microlog.gmi
MICROLOG_OUTPUTS := $(MICROLOG_TARGET) $(wildcard content/logs/microlog/*)
LONGLOG_TARGET := content/logs/longlog.gmi
all: microlog loglog longlog add_feeds .DELETE_ON_ERROR:
all: $(MICROLOG_TARGET) $(MICROLOG_OUTPUTS) $(LONGLOG_TARGET) $(LOGLOG_TARGET) $(FEED_OUTPUTS)
microlog: $(MICROLOG_ENTRIES) $(MICROLOG_HEADER) $(MICROLOG_TARGET): $(wildcard microlog/*) $(MICROLOG_HEADER)
bash ./build_microlog.bash bash ./build_microlog.bash
longlog: $(LONGLOG_ENTRIES) $(LONGLOG_HEADER) $(LONGLOG_TARGET): $(LONGLOG_ENTRIES) $(LONGLOG_HEADER)
bash ./build_longlog.bash bash ./build_longlog.bash
loglog: microlog longlog $(LOGLOG_HEADER) $(LOGLOG_TARGET): $(MICROLOG_TARGET) $(LONGLOG_TARGET) $(LOGLOG_HEADER)
bash ./build_loglog.bash bash ./build_loglog.bash
add_feeds: $(COMITIUM_DATA)/feeds.txt $(FEED_TARGET): $(COMITIUM_DATA)/feeds.txt
rm -f $(COMITIUM_DATA)/comitium.json rm -f $(COMITIUM_DATA)/comitium.json
while read feed; do \ while read feed; do \
comitium add --data "$(COMITIUM_DATA)" $$feed; \ comitium add --data "$(COMITIUM_DATA)" $$feed; \
done <$(COMITIUM_DATA)/feeds.txt done <$(COMITIUM_DATA)/feeds.txt
clean:
rm -rf $(MICROLOG_OUTPUTS) $(LONGLOG_TARGET) $(LOGLOG_TARGET) $(FEED_OUTPUTS)
+1 -1
View File
@@ -30,7 +30,7 @@ for ((i=${#posts[@]}-1; i>=0; i--)); do
cat "${posts[i]}" >> "$MICROLOG" cat "${posts[i]}" >> "$MICROLOG"
trim_microlog_tail trim_microlog_tail
else else
echo "Error: $post does not match format YYYY-MM-DD(.n). Aborting..." echo "Error: ${posts[i]} does not match format YYYY-MM-DD(.n). Aborting..."
exit 1 exit 1
fi fi
done done