From 6d1cfa6a75434a1dd534b660f91d11b1e71841e8 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Tue, 20 Nov 2018 13:10:36 -0500
Subject: [PATCH] transfer.sh: add subcommands to devsign and sign releases

Both subcommands take a SIGDIR argument which is assumed to be within
a git repo we can safely sync.  devsign creates commits but does not
(currently) push them, leaving that to the user.
---
 signing/transfer.sh | 46 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/signing/transfer.sh b/signing/transfer.sh
index 22f45b220d..4a152f82c7 100755
--- a/signing/transfer.sh
+++ b/signing/transfer.sh
@@ -46,6 +46,28 @@ download() {
     popd >/dev/null
 }
 
+devsign() {
+    local channel="$1"
+    local version="$2"
+
+    "$(dirname $0)/../core_dev_sign_update" \
+        --data_dir "${BASEDIR}" \
+        --version "${version}" \
+        --output_dir "${SIGDIR}"
+
+    git -C "${SIGDIR}" add .
+    git -C "${SIGDIR}" commit -m "Add sigs from ${USER} for ${channel} ${version}"
+}
+
+sign() {
+    local channel="$1"
+    local version="$2"
+
+    "$(dirname $0)/sign.sh" \
+        "${BASEDIR}/${BOARD}/${version}" \
+        "${SIGDIR}/${BOARD}/${version}"
+}
+
 upload() {
     local channel="$1"
     local version="$2"
@@ -141,6 +163,7 @@ roll() {
 
 usage() {
     echo "Usage: $0 {download|upload} <ARTIFACT-DIR> [{-a|-b|-s} <VERSION>]..." >&2
+    echo "Usage: $0 {devsign|sign} <ARTIFACT-DIR> <SIG-DIR> [{-a|-b|-s} <VERSION>]..." >&2
     echo "Usage: $0 ready [{-a|-b|-s} <VERSION>]..." >&2
     echo "Usage: $0 roll [{-a|-b|-s} <HOURS-TO-100-PERCENT>]..." >&2
     exit 1
@@ -150,7 +173,7 @@ usage() {
 CMD="${1:-}"
 shift ||:
 case "${CMD}" in
-    download)
+    download|devsign|sign)
         ;;
     upload|ready|roll)
         if [[ -e "${HOME}/.config/roller.conf" ]]; then
@@ -167,9 +190,9 @@ case "${CMD}" in
         ;;
 esac
 
-# Parse basedir if necessary.
+# Parse fixed args if necessary.
 case "${CMD}" in
-    download|upload)
+    download|devsign|sign|upload)
         BASEDIR="${1:-}"
         shift ||:
         if [[ -z "${BASEDIR}" ]]; then
@@ -177,6 +200,23 @@ case "${CMD}" in
         fi
         ;;
 esac
+case "${CMD}" in
+    devsign|sign)
+        SIGDIR="${1:-}"
+        shift ||:
+        if [[ -z "${SIGDIR}" ]]; then
+            usage
+        fi
+        ;;
+esac
+
+# Sync SIGDIR exactly once.
+case "${CMD}" in
+    devsign|sign)
+        echo "Updating ${SIGDIR}..."
+        git -C "${SIGDIR}" pull -r
+        ;;
+esac
 
 # Walk argument pairs.
 while [[ $# > 0 ]]; do