[checkmk-commits] Check_MK Git: check_mk: Aliases cmk and mkp in bin

Module: check_mk Branch: master Commit: cd78244ac74446baa7c97efad1157b4c1f26cf7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd78244ac74446… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 17 07:42:09 2010 +0100 Aliases cmk and mkp in bin --- ChangeLog | 4 ++++ LIESMICH.zutun | 5 ----- scripts/setup.sh | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa91d98..bf4873c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ * Multisite: removed (undocumented) view parameters show_buttons and show_controls. Please use display_options instead. + Core, Setup, etc.: + * Create alias 'cmk' for check_mk in bin/ (easier typing) + * Create alias 'mkp' for check_mk -P in bin/ (easier typing) + Multisite: * Finally show host/services icons from the nagios value "icon_image". Put your icon files in /usr/share/check_mk/web/htdocs/images/icons. diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 413c32d..7bba7c7 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -111,11 +111,6 @@ SNMP Version pro Host erkennen und speichern. Man könnte als erstes mit v2 versuchen und wenn das nicht geht auf v1 umschalten. Falls das nicht geht, dann kann man eben kein SNMP machen. -Aliasse einbauen (Wrappen in bin/): - cmk = check_mk - mkp = check_mk -P - - -------------------------------------------------------------------------------- ab 1.1.11i1 diff --git a/scripts/setup.sh b/scripts/setup.sh index 8c8cfcd..840867b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -662,8 +662,11 @@ do fi && mkdir -p $DESTDIR$bindir && rm -f $DESTDIR$bindir/check_mk && - echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk + echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk && chmod 755 $DESTDIR$bindir/check_mk && + ln -s $DESTDIR$bindir/check_mk cmk && + echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && + chmod 755 $DESTDIR$bindir/mkp && sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg && sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$docdir/check_mk_templates.cfg && sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$docdir/check_mk_templates.cfg &&