[gentoo-commits] proj/qa-scripts:master commit in: /

[Robin H. Johnson]

commit:     c4451a64cb3c474c5ecc9609c6534924fb063003
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 03:33:53 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May  4 03:33:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c4451a64

keyrings: shellcheck validation

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 keyrings-export.bash                               |  1 +
 ....org.bash => keyrings-recv-keys.gentoo.org.bash |  2 +-
 keyrings-import-sks.bash => keyrings-recv-sks.bash |  2 +-
 ....org.bash => keyrings-send-keys.gentoo.org.bash |  2 +-
 keyrings.inc.bash                                  | 22 +++++++++++++---------
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 06f5bab..e2bbb14 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -7,6 +7,7 @@
 
 OUTPUT_DIR=${1:-.}
 BASEDIR="$(dirname "$0")"
+# shellcheck source=./keyrings.inc.bash
 source "${BASEDIR}"/keyrings.inc.bash
 
 set -e

diff --git a/keyrings-import-keys.gentoo.org.bash 
b/keyrings-recv-keys.gentoo.org.bash
similarity index 92%
rename from keyrings-import-keys.gentoo.org.bash
rename to keyrings-recv-keys.gentoo.org.bash
index 3328e2c..ee8feeb 100755
--- a/keyrings-import-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -4,8 +4,8 @@
 # TODO:
 # - Turn off export in this script
 
-OUTPUT_DIR=${1:-.}
 BASEDIR="$(dirname "$0")"
+# shellcheck source=./keyrings.inc.bash
 source "${BASEDIR}"/keyrings.inc.bash
 
 set -e

diff --git a/keyrings-import-sks.bash b/keyrings-recv-sks.bash
similarity index 92%
rename from keyrings-import-sks.bash
rename to keyrings-recv-sks.bash
index 3d04ebc..c5e1d1c 100755
--- a/keyrings-import-sks.bash
+++ b/keyrings-recv-sks.bash
@@ -4,8 +4,8 @@
 # TODO:
 # - Turn off export in this script
 
-OUTPUT_DIR=${1:-.}
 BASEDIR="$(dirname "$0")"
+# shellcheck source=./keyrings.inc.bash
 source "${BASEDIR}"/keyrings.inc.bash
 
 set -e

diff --git a/keyrings-export-keys.gentoo.org.bash 
b/keyrings-send-keys.gentoo.org.bash
similarity index 91%
rename from keyrings-export-keys.gentoo.org.bash
rename to keyrings-send-keys.gentoo.org.bash
index 38a3478..7e16267 100755
--- a/keyrings-export-keys.gentoo.org.bash
+++ b/keyrings-send-keys.gentoo.org.bash
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Export key updates to Keyservers: keys.gentoo.org
 
-OUTPUT_DIR=${1:-.}
 BASEDIR="$(dirname "$0")"
+# shellcheck source=./keyrings.inc.bash
 source "${BASEDIR}"/keyrings.inc.bash
 
 set -e

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 427a6f2..c885e8d 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -7,9 +7,13 @@ 
COMMIT_RULE='(&(gentooAccess=git.gentoo.org/repo/gentoo.git)(gentooStatus=active
 
NONCOMMIT_RULE='(&(!(gentooAccess=git.gentoo.org/repo/gentoo.git))(gentooStatus=active))'
 RETIRED_RULE='(!(gentooStatus=active))'
 
-KS_GENTOO=hkps://keys.gentoo.org/
-KS_SKS=hkps://hkps.pool.sks-keyservers.net/
-KEYSERVERS=( ) # empty by default
+export KS_GENTOO=hkps://keys.gentoo.org/
+export KS_SKS=hkps://hkps.pool.sks-keyservers.net/
+export KEYSERVERS=( ) # empty by default
+export COMMITTING_DEVS=( )
+export NONCOMMITTING_DEVS=( )
+export RETIRED_DEVS=( )
+export SYSTEM_KEYS=( )
 
 # grab_ldap_fingerprints <ldap-rule>
 grab_ldap_fingerprints() {
@@ -61,12 +65,12 @@ push_keys() {
        done
 }
 
-
+export GPG_TMPDIR=''
 clean_tmp() {
        [ -n "$GPG_TMPDIR" ] && [ -d "$GPG_TMPDIR" ] && rm -rf "$GPG_TMPDIR"
 }
 setup_tmp() {
-       export GPG_TMPDIR=$(mktemp -d)
+       GPG_TMPDIR=$(mktemp -d)
        trap clean_tmp EXIT
 }
 
@@ -90,8 +94,8 @@ export_keys() {
 
 # populate common variables
 export_ldap_data_to_env() {
-       export COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
-       export NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${NONCOMMIT_RULE}") )
-       export RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
-       export SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
+       export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
+       export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${NONCOMMIT_RULE}") )
+       export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
+       export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 }