diff options
author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-04-11 11:54:03 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-04-11 12:45:05 +0000 |
commit | 80056eeb0bed7c1b3346d68dd2d515b8b8ebf6bb (patch) | |
tree | f2ea6acfa29b1a7fbaa0fbf9934bc5264bcde947 | |
parent | Releasing version 20210101. (diff) | |
download | compute-tools-80056eeb0bed7c1b3346d68dd2d515b8b8ebf6bb.tar.xz compute-tools-80056eeb0bed7c1b3346d68dd2d515b8b8ebf6bb.zip |
Moving command files from /usr/lib to /usr/libexec.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rw-r--r-- | Makefile | 26 | ||||
-rwxr-xr-x | bin/container | 4 | ||||
-rwxr-xr-x | bin/container-shell | 4 | ||||
-rwxr-xr-x | libexec/container/auto (renamed from lib/container/auto) | 0 | ||||
-rwxr-xr-x | libexec/container/console (renamed from lib/container/console) | 0 | ||||
-rwxr-xr-x | libexec/container/create (renamed from lib/container/create) | 0 | ||||
-rwxr-xr-x | libexec/container/enter (renamed from lib/container/enter) | 0 | ||||
-rwxr-xr-x | libexec/container/key (renamed from lib/container/key) | 0 | ||||
-rwxr-xr-x | libexec/container/limit (renamed from lib/container/limit) | 0 | ||||
-rwxr-xr-x | libexec/container/list (renamed from lib/container/list) | 0 | ||||
-rwxr-xr-x | libexec/container/log (renamed from lib/container/log) | 0 | ||||
-rwxr-xr-x | libexec/container/move (renamed from lib/container/move) | 0 | ||||
-rwxr-xr-x | libexec/container/remove (renamed from lib/container/remove) | 0 | ||||
-rwxr-xr-x | libexec/container/restart (renamed from lib/container/restart) | 0 | ||||
-rwxr-xr-x | libexec/container/run (renamed from lib/container/run) | 0 | ||||
-rwxr-xr-x | libexec/container/start (renamed from lib/container/start) | 0 | ||||
-rwxr-xr-x | libexec/container/status (renamed from lib/container/status) | 0 | ||||
-rwxr-xr-x | libexec/container/stop (renamed from lib/container/stop) | 0 | ||||
-rwxr-xr-x | libexec/container/top (renamed from lib/container/top) | 0 | ||||
-rwxr-xr-x | libexec/container/version (renamed from lib/container/version) | 0 | ||||
-rw-r--r-- | share/bash-completion/container | 2 | ||||
-rw-r--r-- | share/man/container.1.txt | 2 |
22 files changed, 19 insertions, 19 deletions
@@ -21,7 +21,7 @@ PROJECT = open-infrastructure SOFTWARE = compute-tools PROGRAM = container -SCRIPTS = bin/* lib/*/* +SCRIPTS = bin/* libexec/*/* all: build @@ -64,8 +64,8 @@ install: build mkdir -p $(DESTDIR)/usr/bin cp -r bin/* $(DESTDIR)/usr/bin - mkdir -p $(DESTDIR)/usr/lib/$(PROJECT) - cp -r lib/* $(DESTDIR)/usr/lib/$(PROJECT) + mkdir -p $(DESTDIR)/usr/libexec/$(PROJECT) + cp -r libexec/* $(DESTDIR)/usr/libexec/$(PROJECT) 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/lib/$(PROJECT)/$(PROGRAM)/cr - ln -sf list $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/ls - ln -sf move $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/mv - ln -sf remove $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/rm - ln -sf restart $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/rs - ln -sf start $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/s - ln -sf status $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/st - ln -sf stop $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/t + 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 mkdir -p $(DESTDIR)/lib/systemd/system cp -r share/systemd/* $(DESTDIR)/lib/systemd/system @@ -177,8 +177,8 @@ uninstall: rm -rf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM) rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share || true - rm -rf $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM) - rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/lib || true + rm -rf $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM) + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/libexec || true for FILE in bin/*; \ do \ diff --git a/bin/container b/bin/container index 4570dc3..1836b33 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/lib/${PROJECT}/${PROGRAM}/${COMMAND}" ] + if [ ! -e "/usr/libexec/${PROJECT}/${PROGRAM}/${COMMAND}" ] then echo "'${COMMAND}': no such ${PROGRAM} command" >&2 exit 1 @@ -91,7 +91,7 @@ do fi # Run - "/usr/lib/${PROJECT}/${PROGRAM}/${COMMAND}" "${OPTIONS}" + "/usr/libexec/${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 016724f..0895691 100755 --- a/bin/container-shell +++ b/bin/container-shell @@ -64,7 +64,7 @@ Shell () echo "The following ${PROGRAM} commands are available:" echo - cd "/usr/lib/${PROJECT}/${PROGRAM}" + cd "/usr/libexec/${PROJECT}/${PROGRAM}" find . -type f -printf " %f\n" | sort cd "${OLDPWD}" @@ -97,7 +97,7 @@ Shell () ;; esac - if [ ! -e "/usr/lib/${PROJECT}/${PROGRAM}/${COMMAND}" ] + if [ ! -e "/usr/libexec/${PROJECT}/${PROGRAM}/${COMMAND}" ] then echo "'${COMMAND}': no such ${PROGRAM} command" >&2 return diff --git a/lib/container/auto b/libexec/container/auto index 6c1d47b..6c1d47b 100755 --- a/lib/container/auto +++ b/libexec/container/auto diff --git a/lib/container/console b/libexec/container/console index 2dc6546..2dc6546 100755 --- a/lib/container/console +++ b/libexec/container/console diff --git a/lib/container/create b/libexec/container/create index bdf9fb4..bdf9fb4 100755 --- a/lib/container/create +++ b/libexec/container/create diff --git a/lib/container/enter b/libexec/container/enter index fed1193..fed1193 100755 --- a/lib/container/enter +++ b/libexec/container/enter diff --git a/lib/container/key b/libexec/container/key index 4cbdaa0..4cbdaa0 100755 --- a/lib/container/key +++ b/libexec/container/key diff --git a/lib/container/limit b/libexec/container/limit index 99ef03a..99ef03a 100755 --- a/lib/container/limit +++ b/libexec/container/limit diff --git a/lib/container/list b/libexec/container/list index ba794ab..ba794ab 100755 --- a/lib/container/list +++ b/libexec/container/list diff --git a/lib/container/log b/libexec/container/log index a18c421..a18c421 100755 --- a/lib/container/log +++ b/libexec/container/log diff --git a/lib/container/move b/libexec/container/move index e20d8a8..e20d8a8 100755 --- a/lib/container/move +++ b/libexec/container/move diff --git a/lib/container/remove b/libexec/container/remove index 75ebd60..75ebd60 100755 --- a/lib/container/remove +++ b/libexec/container/remove diff --git a/lib/container/restart b/libexec/container/restart index 3c84f4d..3c84f4d 100755 --- a/lib/container/restart +++ b/libexec/container/restart diff --git a/lib/container/run b/libexec/container/run index f6323c0..f6323c0 100755 --- a/lib/container/run +++ b/libexec/container/run diff --git a/lib/container/start b/libexec/container/start index 30aee53..30aee53 100755 --- a/lib/container/start +++ b/libexec/container/start diff --git a/lib/container/status b/libexec/container/status index a4b49e1..a4b49e1 100755 --- a/lib/container/status +++ b/libexec/container/status diff --git a/lib/container/stop b/libexec/container/stop index 6b8caee..6b8caee 100755 --- a/lib/container/stop +++ b/libexec/container/stop diff --git a/lib/container/top b/libexec/container/top index d9baa1c..d9baa1c 100755 --- a/lib/container/top +++ b/libexec/container/top diff --git a/lib/container/version b/libexec/container/version index c2b7716..c2b7716 100755 --- a/lib/container/version +++ b/libexec/container/version diff --git a/share/bash-completion/container b/share/bash-completion/container index 4e49cec..b1f3f93 100644 --- a/share/bash-completion/container +++ b/share/bash-completion/container @@ -286,7 +286,7 @@ _container() ;; *) - local commands=$(cd /usr/lib/open-infrastructure/container 2>/dev/null && find * -type f -print) + local commands=$(cd /usr/libexec/open-infrastructure/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 d7ad339..179794f 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/lib/open-infrastructure/container*:: +*/usr/libexec/open-infrastructure/container*:: Container commands. */usr/share/open-infrastructure/container*:: |