summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-02-17 10:52:12 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-02-23 15:22:19 +0000
commit0f0239db45cbd40ff79f301bbade2f2dcb005931 (patch)
treed66fc84e20c05d71a083b4020ab549a7fd277d22 /bin
parentRemoving manpage symlinks in uninstall target too. (diff)
downloadcompute-tools-0f0239db45cbd40ff79f301bbade2f2dcb005931.tar.xz
compute-tools-0f0239db45cbd40ff79f301bbade2f2dcb005931.zip
Renaming container-tools to compute-tools.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xbin/container15
-rwxr-xr-xbin/container-shell8
2 files changed, 11 insertions, 12 deletions
diff --git a/bin/container b/bin/container
index 50e5379..5df0fff 100755
--- a/bin/container
+++ b/bin/container
@@ -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,10 @@
set -e
-SOFTWARE="container-tools"
+PROJECT="open-infrastructure"
PROGRAM="container"
-HOOKS="/etc/${SOFTWARE}/hooks"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
# Parameter
PARAMETER="${1}"
@@ -44,7 +43,7 @@ OPTIONS="${@}"
for COMMAND in $(echo ${COMMANDS} | sed -e 's|,| |g')
do
- if [ ! -e "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" ]
+ if [ ! -e "/usr/lib/${PROJECT}/${PROGRAM}/${COMMAND}" ]
then
echo "'${COMMAND}': no such ${PROGRAM} command" >&2
exit 1
@@ -71,12 +70,12 @@ do
HOST="$(hostname -f)"
# logfile
- echo "${DATE} ${HOST} ${USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
+ echo "${DATE} ${HOST} ${USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${PROJECT}/${PROGRAM}.log"
# irc
- if [ -e /usr/bin/irk ] && [ -e "/etc/default/${SOFTWARE}" ]
+ if [ -e /usr/bin/irk ] && [ -e "/etc/${PROJECT}/${PROGRAM}.conf" ]
then
- . /etc/default/${SOFTWARE}
+ . "/etc/${PROJECT}/${PROGRAM}.conf"
if [ -n "${IRK_TARGETS}" ]
then
@@ -91,7 +90,7 @@ do
fi
# Run
- "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}"
+ "/usr/lib/${PROJECT}/${PROGRAM}/${COMMAND}" "${OPTIONS}"
# Post hooks
for FILE in "${HOOKS}/post-${PROGRAM}".* "${HOOKS}/${NAME}.post-${PROGRAM}"
diff --git a/bin/container-shell b/bin/container-shell
index bce7cee..fe113d3 100755
--- a/bin/container-shell
+++ b/bin/container-shell
@@ -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,7 +19,8 @@
set -e
-SOFTWARE="container-tools"
+PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
PROGRAM="container"
COMMAND="$(basename ${0})"
@@ -64,7 +64,7 @@ Shell ()
echo "The following ${PROGRAM} commands are available:"
echo
- cd "/usr/lib/${SOFTWARE}/${PROGRAM}"
+ cd "/usr/lib/${PROJECT}/${PROGRAM}"
find . -type f -printf " %f\n" | sort
cd "${OLDPWD}"
@@ -97,7 +97,7 @@ Shell ()
;;
esac
- if [ ! -e "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" ]
+ if [ ! -e "/usr/lib/${PROJECT}/${PROGRAM}/${COMMAND}" ]
then
echo "'${COMMAND}': no such ${PROGRAM} command" >&2
return