From 51100efa1d703c68d3fc78175013dd5cc2b86d67 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 4 Apr 2019 14:15:08 +0200
Subject: [PATCH] Rename _ARCHIVES to .ARCHIVES, process public archive files
 twice

---
 Tupfile           | 2 +-
 Tuprules.tup      | 8 ++++----
 errata/bin.mk.awk | 2 +-
 errata/pkg.mk.awk | 4 ++--
 errata/raw.mk.awk | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Tupfile b/Tupfile
index 20e5823..2ade8f6 100644
--- a/Tupfile
+++ b/Tupfile
@@ -24,7 +24,7 @@ SHORT_SUM = b2sum -l24
 
 : $(DEPOT_DIR)/<packages> |> ^ generate package version sed script^ \
 	for d in `dirname %<packages> | tr ' ' '\n' | sort -u`; do \
-		echo $d/`cat $d/_ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \
+		echo $d/`cat $d/.ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \
 			'{print "s|local/pkg/"$4"/current|@(PUBLIC_USER)/pkg/"$4"/"substr($6,0,6)"|"}' >> %o; \
 	done \
 |> $(PKG_SED_FILE)
diff --git a/Tuprules.tup b/Tuprules.tup
index 41a73e2..6f768a6 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -13,11 +13,11 @@ endif
 !raw = |> ^ COLLECT %o^ \
 	echo $(RAW_DEPENDS) local/raw/$(RAW_NAME)/$(RAW_VERSION) | tr ' ' '\n' > %o; \
 	echo local/raw/$(RAW_NAME)/$(RAW_VERSION) > %o \
-|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/_ARCHIVES $(DEPOT_DIR)/<raw-archives>
+|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/.ARCHIVES $(DEPOT_DIR)/<raw-archives>
 
 !bin = |> ^ COLLECT %o^ \
 	echo $(BIN_DEPENDS) local/src/$(BIN_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \
-|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/_ARCHIVES $(DEPOT_DIR)/<bin-archives>
+|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/.ARCHIVES $(DEPOT_DIR)/<bin-archives>
 
 AWK_LOCAL_ARCHIVES = awk -F '/' \
 	'{if ($1 != "local") {print $0} \
@@ -40,10 +40,10 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
 			-e 's|_/\(.*\)/\(.*\)$|local/\1/\2/current|' \
 		> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives; \
 	sed -f $(VERSIONS_SED_FILE) $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \
-		> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/_ARCHIVES; \
+		> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/.ARCHIVES; \
 |> \
 	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \
-	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/_ARCHIVES \
+	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/.ARCHIVES \
 	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime \
 	$(DEPOT_DIR)/<packages>
 
diff --git a/errata/bin.mk.awk b/errata/bin.mk.awk
index d81abe1..0c6d344 100644
--- a/errata/bin.mk.awk
+++ b/errata/bin.mk.awk
@@ -7,6 +7,6 @@
 { print tar": "FILENAME }
 { print "	@echo tar  $@" }
 { print "	@mkdir -p $(dir $@)" }
-{ print "	@tar cfJ $@ --exclude=_ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." }
+{ print "	@tar cfJ $@ --exclude=.ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." }
 
 }}
diff --git a/errata/pkg.mk.awk b/errata/pkg.mk.awk
index f9847a6..8094d70 100644
--- a/errata/pkg.mk.awk
+++ b/errata/pkg.mk.awk
@@ -4,10 +4,10 @@
 
 { print "all: " tar ".sig" }
 
-{ print tar": depot/local/pkg/"$6"/current/_ARCHIVES pkg.sed" }
+{ print tar": depot/local/pkg/"$6"/current/.ARCHIVES pkg.sed" }
 { print "	@echo tar  $@" }
 { print "	@mkdir -p $(dir $@) "ver }
-{ print "	@cp $< "ver"/archives" }
+{ print "	@sed -f pkg.sed $< > "ver"/archives" }
 { print "	@cp $(dir $<)/runtime "ver }
 { print "	@tar cfJ $@ "ver }
 { print "	@rm -r "ver }
diff --git a/errata/raw.mk.awk b/errata/raw.mk.awk
index c46554f..a282bfc 100644
--- a/errata/raw.mk.awk
+++ b/errata/raw.mk.awk
@@ -5,4 +5,4 @@
 { print tar": "FILENAME }
 { print "	@echo tar  $@" }
 { print "	@mkdir -p $(dir $@)" }
-{ print "	@tar cfJ $@ --exclude=_ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." }
+{ print "	@tar cfJ $@ --exclude=.ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." }