summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-04-11 12:36:12 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-04-11 12:45:43 +0000
commitf2f17acc25862fed039e8e762ffbab82f38e2e1d (patch)
treea652c70aa133dc27604028676af76874ee887816
parentUsing /usr/libexec/container instead of /usr/libexec/open-infrastructure/cont... (diff)
downloadcompute-tools-f2f17acc25862fed039e8e762ffbab82f38e2e1d.tar.xz
compute-tools-f2f17acc25862fed039e8e762ffbab82f38e2e1d.zip
Using /usr/share/compute-tools instead of /usr/share/open-infrastructure/container.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rw-r--r--Makefile18
-rwxr-xr-xlibexec/container/create4
-rwxr-xr-xlibexec/container/version2
-rw-r--r--share/bash-completion/container2
-rw-r--r--share/man/container-create-curl.1.txt2
-rw-r--r--share/man/container-create-debconf.1.txt2
-rw-r--r--share/man/container.1.txt2
-rwxr-xr-xshare/scripts/curl2
-rwxr-xr-xshare/scripts/debconf2
9 files changed, 18 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 1d31199..b7b0b28 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,9 @@ install: build
mkdir -p $(DESTDIR)/usr/libexec
cp -r libexec/* $(DESTDIR)/usr/libexec
- mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
- cp -r VERSION.txt $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
- cp -r share/config share/hooks share/scripts $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+ mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)
+ cp -r VERSION.txt $(DESTDIR)/usr/share/$(SOFTWARE)
+ cp -r share/config share/hooks share/scripts $(DESTDIR)/usr/share/$(SOFTWARE)
mkdir -p $(DESTDIR)/usr/share/bash-completion/completions
cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions
@@ -102,13 +102,13 @@ install: build
ln -sf container-shell.1 $(DESTDIR)/usr/share/man/man1/cntsh.1
ln -sf container $(DESTDIR)/usr/share/bash-completion/completions/cnt
- ln -sf debconf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/debian
- ln -sf debconf.d $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/debian.d
+ ln -sf debconf $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/debian
+ ln -sf debconf.d $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/debian.d
ln -sf container-create-debconf.1 $(DESTDIR)/usr/share/man/man1/container-create-debian.1
- ln -sf debconf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/progress-linux
- ln -sf debconf.d $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/progress-linux.d
+ ln -sf debconf $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/progress-linux
+ ln -sf debconf.d $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/progress-linux.d
ln -sf container-create-debconf.1 $(DESTDIR)/usr/share/man/man1/container-create-progress-linux.1
- ln -sf debootstrap $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/mmdebstrap
+ ln -sf debootstrap $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/mmdebstrap
ln -sf container-create-debootstrap.1 $(DESTDIR)/usr/share/man/man1/container-create-mmdebstrap.1
ln -sf create $(DESTDIR)/usr/libexec/$(PROGRAM)/cr
@@ -174,7 +174,7 @@ uninstall:
rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)
rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/doc || true
- rm -rf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+ rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)
rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share || true
rm -rf $(DESTDIR)/usr/libexec/$(PROGRAM)
diff --git a/libexec/container/create b/libexec/container/create
index 91ba4c6..3d639e5 100755
--- a/libexec/container/create
+++ b/libexec/container/create
@@ -27,8 +27,8 @@ COMMAND="$(basename ${0})"
CONFIG="/etc/${SOFTWARE}/config"
HOOKS="/etc/${SOFTWARE}/hooks"
MACHINES="/var/lib/machines"
-SCRIPTS="/usr/share/${PROJECT}/${PROGRAM}/scripts"
-CONFIG_TEMPLATE="/usr/share/${PROJECT}/${PROGRAM}/config/container.conf.in"
+SCRIPTS="/usr/share/${SOFTWARE}/scripts"
+CONFIG_TEMPLATE="/usr/share/${SOFTWARE}/config/container.conf.in"
Parameters ()
{
diff --git a/libexec/container/version b/libexec/container/version
index f74c696..7e90b4e 100755
--- a/libexec/container/version
+++ b/libexec/container/version
@@ -25,7 +25,7 @@ PROGRAM="container"
COMMAND="$(basename ${0})"
HOOKS="/etc/${SOFTWARE}/hooks"
-SHARE="/usr/share/${PROJECT}/${PROGRAM}"
+SHARE="/usr/share/${SOFTWARE}"
# Pre hooks
for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
diff --git a/share/bash-completion/container b/share/bash-completion/container
index 869c920..810d1c2 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -69,7 +69,7 @@ _container()
;;
-s|--script)
- opts="$(cd /usr/share/open-infrastructure/container/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
+ opts="$(cd /usr/share/compute-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
return 0
;;
diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt
index e049b23..251b05d 100644
--- a/share/man/container-create-curl.1.txt
+++ b/share/man/container-create-curl.1.txt
@@ -86,7 +86,7 @@ The following files are used:
*/etc/compute-tools/config*::
Container configuration files.
-*/usr/share/open-infrastructure/container/scripts*::
+*/usr/share/compute-tools/scripts*::
Container creation scripts.
*/usr/share/doc/compute-tools*::
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index fb0a838..a209594 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -117,7 +117,7 @@ The following files are used:
*/etc/compute-tools/config*::
Container configuration files.
-*/usr/share/open-infrastructure/container/scripts*::
+*/usr/share/compute-tools/scripts*::
Container creation scripts.
*/usr/share/doc/compute-tools*::
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 6646d6f..fd5f354 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -116,7 +116,7 @@ The following files are used:
*/usr/libexec/container*::
Container commands.
-*/usr/share/open-infrastructure/container*::
+*/usr/share/compute-tools/*::
Container shared data.
*/usr/share/doc/compute-tools*::
diff --git a/share/scripts/curl b/share/scripts/curl
index 7d7661a..a975214 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -267,7 +267,7 @@ then
Debconf
# Run debconf parts
- for DEBCONF_SCRIPT in /usr/share/${PROJECT}/${PROGRAM}/scripts/curl.d/*
+ for DEBCONF_SCRIPT in /usr/share/${SOFTWARE}/scripts/curl.d/*
do
if [ -x "${DEBCONF_SCRIPT}" ]
then
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 0147212..40606ca 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -1121,7 +1121,7 @@ do
done
# Run debconf parts
-for DEBCONF_SCRIPT in "/usr/share/${PROJECT}/${PROGRAM}/scripts/debconf.d"/*
+for DEBCONF_SCRIPT in "/usr/share/${SOFTWARE}/scripts/debconf.d"/*
do
if [ -x "${DEBCONF_SCRIPT}" ]
then