Module: check_mk
Branch: master
Commit: bf43438f991b9541df0e4f69ff3b0d3de3284331
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf43438f991b95…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed May 16 09:54:10 2018 +0200
6093 FIX Bash completion: Make completion work on SLES
The completion file of the RPMs is now installed as /etc/bash_completion.d/omd.sh instead
of /etc/bash_completion.d/omd because SLES only interprets files ending with .sh.
Change-Id: I69fc5075537ec6654c0f93c90137a52cca7b02f6
---
.werks/6093 | 12 ++++++++++++
omd/omd.spec.in | 3 ++-
omd/packages/omd/.f12 | 1 +
omd/packages/omd/bash_completion | 6 ++++++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/.werks/6093 b/.werks/6093
new file mode 100644
index 0000000..309f054
--- /dev/null
+++ b/.werks/6093
@@ -0,0 +1,12 @@
+Title: Bash completion: Make completion work on SLES
+Level: 1
+Component: omd
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1526457105
+
+The completion file of the RPMs is now installed as /etc/bash_completion.d/omd.sh
instead
+of /etc/bash_completion.d/omd because SLES only interprets files ending with .sh.
diff --git a/omd/omd.spec.in b/omd/omd.spec.in
index a70488e..23631f7 100644
--- a/omd/omd.spec.in
+++ b/omd/omd.spec.in
@@ -81,7 +81,7 @@ ln -sfn "%{version}" /omd/versions/default
ln -sfn /omd/versions/default/bin/omd /usr/bin/omd
ln -sfn /omd/versions/default/share/man/man8/omd.8.gz /usr/share/man/man8/omd.8.gz
ln -sfn /omd/versions/default/share/omd/apache.conf @APACHE_CONFDIR@/zzz_omd.conf
-ln -sfn /omd/versions/default/lib/omd/bash_completion /etc/bash_completion.d/omd
+ln -sfn /omd/versions/default/lib/omd/bash_completion /etc/bash_completion.d/omd.sh
IS_SYSTEMD=0
if [ -d /usr/lib/systemd ] && which systemctl >/dev/null 2>&1; then
@@ -189,6 +189,7 @@ else
rm -f /usr/bin/omd
rm -f /usr/share/man/man8/omd.8.gz
rm -f /etc/bash_completion.d/omd
+ rm -f /etc/bash_completion.d/omd.sh
# Can be either the symlink /etc/init.d/omd or the regular
# file /etc/systemd/system/omd.service.
diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12
index 13156a6..c4dccd3 100755
--- a/omd/packages/omd/.f12
+++ b/omd/packages/omd/.f12
@@ -6,6 +6,7 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)}
ROOT=/omd/sites/$SITE
# Little install helper used during development and test
+sudo cp -v bash_completion $ROOT/lib/omd/bash_completion
sudo cp -v index.py $ROOT/share/omd/htdocs/index.py
sudo cp -v logout.php $ROOT/share/omd/htdocs/logout.php
sudo rm -vf $ROOT/share/man/man8/omd.8.gz
diff --git a/omd/packages/omd/bash_completion b/omd/packages/omd/bash_completion
index b8589df..bdbc855 100644
--- a/omd/packages/omd/bash_completion
+++ b/omd/packages/omd/bash_completion
@@ -8,6 +8,12 @@ _omd_cmd_options() {
return
}
+# Return true if the completion should be treated as running as root
+_complete_as_root()
+{
+ [[ $EUID -eq 0 || ${root_command:-} ]]
+}
+
_omd()
{
local GLOBALCMDS="sites|version|versions|help"