From 93d59c3176876b0990b27375458cf6518459bb07 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 23 Feb 2019 16:36:10 +0100
Subject: Merging upstream version 20190222.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 lib/container/key | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/container/key')

diff --git a/lib/container/key b/lib/container/key
index 3f0f57b..1b59555 100755
--- a/lib/container/key
+++ b/lib/container/key
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,9 +19,11 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-KEYS="/etc/container-tools/keys"
+KEYS="/etc/${PROJECT}/${PROGRAM}/keys"
 
 Parameters ()
 {
@@ -74,7 +75,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} [-a|--add KEY] [-l|--list] [-r|--remove KEY]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} [-a|--add KEY] [-l|--list] [-r|--remove KEY]" >&2
 	exit 1
 }
 
-- 
cgit v1.2.3