From 9ec91ddbc05aa7f7fac3428a55a2ce4ceb74f1e8 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Tue, 29 Oct 2019 00:35:44 -0400
Subject: [PATCH] move computers/cain/fish/void-{quick,repo} to fish/

---
 computers/cain/fish/void-repo            |  6 ------
 {computers/cain/fish => fish}/void-quick |  0
 fish/void-repo                           | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
 delete mode 100644 computers/cain/fish/void-repo
 rename {computers/cain/fish => fish}/void-quick (100%)
 create mode 100644 fish/void-repo

diff --git a/computers/cain/fish/void-repo b/computers/cain/fish/void-repo
deleted file mode 100644
index 0f724cf..0000000
--- a/computers/cain/fish/void-repo
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: syntax=fish:
-
-function xrupdate -d "Sign and upload voidlinux package repository"
-	xbps-rindex --privkey $_agw_secret_void_privkey --sign-pkg "$XBPS_HOSTDIR"/binpkgs/*.xbps
-	rsync -azvh --progress "$XBPS_HOSTDIR"/binpkgs/* "$_agw_secret_void_copy_dir"
-end
diff --git a/computers/cain/fish/void-quick b/fish/void-quick
similarity index 100%
rename from computers/cain/fish/void-quick
rename to fish/void-quick
diff --git a/fish/void-repo b/fish/void-repo
new file mode 100644
index 0000000..f7548a4
--- /dev/null
+++ b/fish/void-repo
@@ -0,0 +1,22 @@
+# vim: syntax=fish:
+
+function xrreload -d "Reload all packages into the package repository"
+	xbps-rindex -f --add "$XBPS_HOSTDIR"/binpkgs/*.xbps
+end
+
+function xrsync -d "Upload voidlinux package repository"
+	rsync $argv -azvh --delete --progress \
+		"$XBPS_HOSTDIR"/binpkgs/ \
+		"$_agw_secret_void_copy_dir"
+end
+
+function xrupdate -d "Sign and upload voidlinux package repository"
+	xrreload
+	xbps-rindex --privkey  "$_agw_secret_void_privkey" \
+	            --sign-pkg "$XBPS_HOSTDIR"/binpkgs/*.xbps
+	xrsync --dry-run
+	echo "continue? [yes/no]"
+	if test (read) = "yes"
+		xrsync
+	end
+end