summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2022-06-04 17:17:58 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2022-06-05 06:14:19 +0000
commit75d94e17ea15ef6ed472f951a0bdad79590bb44f (patch)
treecb8309e683d01566a5ecbfd2f98cae9a125d04b4
parentCorrecting container status bash-completion to complete on all containers rat... (diff)
downloadcompute-tools-75d94e17ea15ef6ed472f951a0bdad79590bb44f.tar.xz
compute-tools-75d94e17ea15ef6ed472f951a0bdad79590bb44f.zip
Using variables in directory paths in container key command.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xlibexec/container/key8
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/container/key b/libexec/container/key
index 5deff0d..efd214e 100755
--- a/libexec/container/key
+++ b/libexec/container/key
@@ -146,12 +146,12 @@ case "${ACTION}" in
if [ -e "${ADD}" ]
then
gpg --homedir "${KEYS}" --import "${ADD}"
- elif [ -e "/usr/share/compute-tools/keys/${ADD}" ]
+ elif [ -e "/usr/share/${SOFTWARE}/keys/${ADD}" ]
then
- gpg --homedir "${KEYS}" --import "/usr/share/compute-tools/keys/${ADD}"
- elif [ -e "/usr/share/compute-tools/keys/${ADD}.pub" ]
+ gpg --homedir "${KEYS}" --import "/usr/share/${SOFTWARE}/keys/${ADD}"
+ elif [ -e "/usr/share/${SOFTWARE}/keys/${ADD}.pub" ]
then
- gpg --homedir "${KEYS}" --import "/usr/share/compute-tools/keys/${ADD}.pub"
+ gpg --homedir "${KEYS}" --import "/usr/share/${SOFTWARE}/keys/${ADD}.pub"
else
gpg --homedir "${KEYS}" --recv "${ADD}"
fi