From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BEF5D158009 for ; Fri, 30 Jun 2023 05:19:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E709FE07C7; Fri, 30 Jun 2023 05:19:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C62C2E07C7 for ; Fri, 30 Jun 2023 05:19:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4F1B340F74 for ; Fri, 30 Jun 2023 05:19:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1786CA9D for ; Fri, 30 Jun 2023 05:19:38 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1688101611.7112f5af5a5b681d6c8d39c2ff0cf27252fc81f3.robbat2@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: / X-VCS-Repository: proj/qa-scripts X-VCS-Files: keyrings-export.bash X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 7112f5af5a5b681d6c8d39c2ff0cf27252fc81f3 X-VCS-Branch: master Date: Fri, 30 Jun 2023 05:19:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 35a56345-04b9-4e24-95b6-3ce49125dc07 X-Archives-Hash: ffe2b940bc2e3cf963897c3d8a92193d commit: 7112f5af5a5b681d6c8d39c2ff0cf27252fc81f3 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Jun 30 05:06:42 2023 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jun 30 05:06:51 2023 +0000 URL: https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7112f5af keyrings-export.bash: fixup export Signed-off-by: Robin H. Johnson gentoo.org> keyrings-export.bash | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/keyrings-export.bash b/keyrings-export.bash index b3234e2..92c0228 100755 --- a/keyrings-export.bash +++ b/keyrings-export.bash @@ -17,35 +17,44 @@ export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONC export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${RETIRED_RULE}") ) export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${NONCOMMIT_RULE}") ) export -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${INFRA_SYSTEM_RULE}") ) +export -a KEYRINGS=( ) export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \ - "${SYSTEM_KEYS[@]}" + "${SYSTEM_KEYS[@]}" \ +&& KEYRINGS+=( service-keys ) export_keys "${OUTPUT_DIR}"/keys/infra-service-keys.gpg \ - "${INFRA_SYSTEM_KEYS[@]}" + "${INFRA_SYSTEM_KEYS[@]}" \ +&& KEYRINGS+=( infra-service-keys ) export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \ - "${COMMITTING_DEVS[@]}" + "${COMMITTING_DEVS[@]}" \ +&& KEYRINGS+=( committing-devs ) export_keys "${OUTPUT_DIR}"/keys/active-devs.gpg \ "${COMMITTING_DEVS[@]}" \ - "${NONCOMMITTING_DEVS[@]}" + "${NONCOMMITTING_DEVS[@]}" \ +&& KEYRINGS+=( active-devs ) export_keys "${OUTPUT_DIR}"/keys/infra-devs.gpg \ - "${INFRA_DEVS[@]}" + "${INFRA_DEVS[@]}" \ +&& KEYRINGS+=( infra-devs ) export_keys "${OUTPUT_DIR}"/keys/retired-devs.gpg \ - "${RETIRED_DEVS[@]}" + "${RETIRED_DEVS[@]}" \ +&& KEYRINGS+=( retired-devs ) # Everybody together now export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \ "${SYSTEM_KEYS[@]}" \ + "${INFRA_SYSTEM_KEYS[@]}" \ "${COMMITTING_DEVS[@]}" \ "${NONCOMMITTING_DEVS[@]}" \ "${INFRA_DEVS[@]}" \ - "${RETIRED_DEVS[@]}" + "${RETIRED_DEVS[@]}" \ +&& KEYRINGS+=( all-devs ) -for key in service-keys committing-devs active-devs infra-devs retired-devs all-devs ; do +for key in "${KEYRINGS[@]}" ; do if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then # Compatibility symlink ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg