From 0f0239db45cbd40ff79f301bbade2f2dcb005931 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 17 Feb 2019 11:52:12 +0100
Subject: Renaming container-tools to compute-tools.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 lib/container/remove | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib/container/remove')

diff --git a/lib/container/remove b/lib/container/remove
index 7b59ed1..13a9bd8 100755
--- a/lib/container/remove
+++ b/lib/container/remove
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -87,7 +88,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME [--allow-stop] [-f|--force] [-v|--verbose]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--allow-stop] [-f|--force] [-v|--verbose]" >&2
 	exit 1
 }
 
@@ -121,7 +122,7 @@ fi
 
 case "${NAME}" in
 	ALL)
-		NAMES="$(container list --format shell --stopped)"
+		NAMES="$(${PROGRAM} list --format shell --stopped)"
 
 		for NAME in ${NAMES}
 		do
@@ -131,7 +132,7 @@ case "${NAME}" in
 					;;
 			esac
 
-			container remove --name ${NAME} ${OPTIONS_ALL} || true
+			${PROGRAM} remove --name ${NAME} ${OPTIONS_ALL} || true
 		done
 
 		exit 0
@@ -151,7 +152,7 @@ case "${STATE}" in
 		case "${ALLOW_STOP}" in
 			true)
 				echo "'${NAME}': container is started, stopping it now" >&2
-				container stop -n ${NAME}
+				${PROGRAM} stop -n ${NAME}
 				;;
 
 			*)
-- 
cgit v1.2.3