diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-04-11 12:21:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-04-11 12:45:20 +0000 |
| commit | 1695aa88c331468e0adddbcc5b098a41d26dbfa6 (patch) | |
| tree | be22bf84deee079d7f63e2dd125dc5ee0362658f | |
| parent | Moving config files from /etc/open-infrastructure to /etc/compute-tools. (diff) | |
| download | compute-tools-1695aa88c331468e0adddbcc5b098a41d26dbfa6.tar.xz compute-tools-1695aa88c331468e0adddbcc5b098a41d26dbfa6.zip | |
Using /usr/libexec/container instead of /usr/libexec/open-infrastructure/container.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
| -rw-r--r-- | Makefile | 22 | ||||
| -rwxr-xr-x | bin/container | 4 | ||||
| -rwxr-xr-x | bin/container-shell | 4 | ||||
| -rw-r--r-- | share/bash-completion/container | 2 | ||||
| -rw-r--r-- | share/man/container.1.txt | 2 |
5 files changed, 17 insertions, 17 deletions
@@ -64,8 +64,8 @@ install: build mkdir -p $(DESTDIR)/usr/bin cp -r bin/* $(DESTDIR)/usr/bin - mkdir -p $(DESTDIR)/usr/libexec/$(PROJECT) - cp -r libexec/* $(DESTDIR)/usr/libexec/$(PROJECT) + 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) @@ -111,14 +111,14 @@ install: build ln -sf debootstrap $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/mmdebstrap ln -sf container-create-debootstrap.1 $(DESTDIR)/usr/share/man/man1/container-create-mmdebstrap.1 - ln -sf create $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/cr - ln -sf list $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/ls - ln -sf move $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/mv - ln -sf remove $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/rm - ln -sf restart $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/rs - ln -sf start $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/s - ln -sf status $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/st - ln -sf stop $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/t + ln -sf create $(DESTDIR)/usr/libexec/$(PROGRAM)/cr + ln -sf list $(DESTDIR)/usr/libexec/$(PROGRAM)/ls + ln -sf move $(DESTDIR)/usr/libexec/$(PROGRAM)/mv + ln -sf remove $(DESTDIR)/usr/libexec/$(PROGRAM)/rm + ln -sf restart $(DESTDIR)/usr/libexec/$(PROGRAM)/rs + ln -sf start $(DESTDIR)/usr/libexec/$(PROGRAM)/s + ln -sf status $(DESTDIR)/usr/libexec/$(PROGRAM)/st + ln -sf stop $(DESTDIR)/usr/libexec/$(PROGRAM)/t mkdir -p $(DESTDIR)/lib/systemd/system cp -r share/systemd/* $(DESTDIR)/lib/systemd/system @@ -177,7 +177,7 @@ uninstall: rm -rf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM) rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share || true - rm -rf $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM) + rm -rf $(DESTDIR)/usr/libexec/$(PROGRAM) rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/libexec || true for FILE in bin/*; \ diff --git a/bin/container b/bin/container index 182d9b4..d99916a 100755 --- a/bin/container +++ b/bin/container @@ -44,7 +44,7 @@ OPTIONS="${@}" for COMMAND in $(echo ${COMMANDS} | sed -e 's|,| |g') do - if [ ! -e "/usr/libexec/${PROJECT}/${PROGRAM}/${COMMAND}" ] + if [ ! -e "/usr/libexec/${PROGRAM}/${COMMAND}" ] then echo "'${COMMAND}': no such ${PROGRAM} command" >&2 exit 1 @@ -91,7 +91,7 @@ do fi # Run - "/usr/libexec/${PROJECT}/${PROGRAM}/${COMMAND}" "${OPTIONS}" + "/usr/libexec/${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 0895691..0622370 100755 --- a/bin/container-shell +++ b/bin/container-shell @@ -64,7 +64,7 @@ Shell () echo "The following ${PROGRAM} commands are available:" echo - cd "/usr/libexec/${PROJECT}/${PROGRAM}" + cd "/usr/libexec/${PROGRAM}" find . -type f -printf " %f\n" | sort cd "${OLDPWD}" @@ -97,7 +97,7 @@ Shell () ;; esac - if [ ! -e "/usr/libexec/${PROJECT}/${PROGRAM}/${COMMAND}" ] + if [ ! -e "/usr/libexec/${PROGRAM}/${COMMAND}" ] then echo "'${COMMAND}': no such ${PROGRAM} command" >&2 return diff --git a/share/bash-completion/container b/share/bash-completion/container index 4789b18..869c920 100644 --- a/share/bash-completion/container +++ b/share/bash-completion/container @@ -286,7 +286,7 @@ _container() ;; *) - local commands=$(cd /usr/libexec/open-infrastructure/container 2>/dev/null && find * -type f -print) + local commands=$(cd /usr/libexec/container 2>/dev/null && find * -type f -print) COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) ) return 0 ;; diff --git a/share/man/container.1.txt b/share/man/container.1.txt index 60d757e..6646d6f 100644 --- a/share/man/container.1.txt +++ b/share/man/container.1.txt @@ -113,7 +113,7 @@ The following files are used: */usr/bin/container-shell*, */usr/bin/cntsh*:: Container shell program. -*/usr/libexec/open-infrastructure/container*:: +*/usr/libexec/container*:: Container commands. */usr/share/open-infrastructure/container*:: |