From 3edf6579f6e1874b46afacd9ce5dac7a38349171 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 3 Oct 2018 12:06:13 -0400
Subject: librerelease: Set DBSCRIPTS_CONFIG for db-update

Its value is configurable in libretools.conf.

I discussed this eventual change in my dbscripts plans on the mailing list.
---
 src/abslibre-tools/librerelease | 2 +-
 src/libretools.conf             | 2 ++
 test/cases/librerelease.bats    | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index be75ab7..5e162ca 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -284,7 +284,7 @@ release_packages() {
 	fi
 
 	msg "Running db-update on repos"
-	ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" "STAGING=${REPODEST_path@Q} db-update"
+	ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" "STAGING=${REPODEST_path@Q} DBSCRIPTS_CONFIG=${DBSCRIPTS_CONFIG@Q} db-update"
 
 	if [[ -n $HOOKPOSTRELEASE ]]; then
 		msg "Running HOOKPOSTRELEASE..."
diff --git a/src/libretools.conf b/src/libretools.conf
index 5258f34..cacd0c9 100644
--- a/src/libretools.conf
+++ b/src/libretools.conf
@@ -27,6 +27,8 @@ ABSLIBRESEND=ssh://git@git.parabola.nu:1863/~git/abslibre/abslibre.git
 
 ## Where to upload packages to
 REPODEST=ssh://$LIBREUSER@repo.parabola.nu:1863/~/staging/
+## Which config file to use with db-update (on the $REPODEST server)
+DBSCRIPTS_CONFIG=/etc/dbscripts/config.local.parabola
 
 ## These are run before and after uploading packages
 HOOKPRERELEASE='ssh -fN ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}"'
diff --git a/test/cases/librerelease.bats b/test/cases/librerelease.bats
index 4e75cf9..1e29525 100644
--- a/test/cases/librerelease.bats
+++ b/test/cases/librerelease.bats
@@ -30,6 +30,7 @@ setup() {
 	# Configure libretools
 	cat >> "$XDG_CONFIG_HOME/libretools/libretools.conf" <<-eot
 		REPODEST=ssh://${USER@Q}@127.0.0.1:${ssh_port@Q}/${tmpdir@Q}/srv-staging/
+		DBSCRIPTS_CONFIG=/etc/dbscripts/config.local.phony
 		HOOKPRERELEASE=:
 		HOOKPOSTRELEASE=:
 		eot
@@ -96,6 +97,7 @@ teardown() {
 	install -Dm755 /dev/stdin "$tmpdir/bin/db-update" <<-eot
 		#!/bin/bash
 		{
+		    printf '%s\n' "\$DBSCRIPTS_CONFIG"
 		    readlink -f -- "\$STAGING"
 		    find "\$STAGING" -printf '%P\n' | LC_COLLATE=C sort
 		} > ${tmpdir@Q}/log.txt
@@ -123,6 +125,7 @@ teardown() {
 	# Make sure everything went OK
 	pwd > "$tmpdir/pwd.txt"
 	cat > "$tmpdir/log-correct.txt" <<-eot
+		/etc/dbscripts/config.local.phony
 		$(readlink -f -- "$tmpdir/srv-staging")
 
 		repo1
-- 
cgit v1.2.2