zabbix/limosek-zaf
1
0
Fork 0
mirror of https://github.com/limosek/zaf.git synced 2024-11-21 18:09:06 +01:00
Code Issues Releases Wiki Activity

Cosmetic changes

Browse Source
This commit is contained in:
Lukas Macura 2016-03-24 20:47:24 +01:00
parent a724c6f5b3
commit bffda469c8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/zaf.lib.sh
View File

@ -206,7 +206,6 @@ zaf_install_plugin() {
control=${ZAF_TMP_DIR}/${plugin}/control control=${ZAF_TMP_DIR}/${plugin}/control
mkdir -p "${ZAF_TMP_DIR}/${plugin}" mkdir -p "${ZAF_TMP_DIR}/${plugin}"
if zaf_plugin_fetch_control "$url" "${control}"; then if zaf_plugin_fetch_control "$url" "${control}"; then
set -e
plugin=$(zaf_ctrl_get_option "${control}" Plugin) plugin=$(zaf_ctrl_get_option "${control}" Plugin)
if [ -n "$plugin" ]; then if [ -n "$plugin" ]; then
echo Installing plugin $plugin from $url... echo Installing plugin $plugin from $url...
@ -243,8 +242,8 @@ zaf_show_installed_plugins() {
cfile=${ZAF_PLUGINS_DIR}/$plugin/control cfile=${ZAF_PLUGINS_DIR}/$plugin/control
echo Plugin $plugin: echo Plugin $plugin:
zaf_ctrl_get_description $cfile Plugin: zaf_ctrl_get_description $cfile Plugin:
echo "Homepage:" $(zaf_ctrl_get_option $cfile Web) echo " Homepage:" $(zaf_ctrl_get_option $cfile Web)
echo "Maintainer:" $(zaf_ctrl_get_option $cfile Maintainer) echo " Maintainer:" $(zaf_ctrl_get_option $cfile Maintainer)
echo echo
done done
} }
@ -273,16 +272,15 @@ zaf_show_plugin() {
if [ -d "$plugindir" ] ; then if [ -d "$plugindir" ] ; then
echo "Plugin $1:" echo "Plugin $1:"
zaf_ctrl_get_description "$cfile" "Plugin:" zaf_ctrl_get_description "$cfile" "Plugin:"
echo "Homepage:" $(zaf_ctrl_get_option $cfile Web) echo " Homepage:" $(zaf_ctrl_get_option $cfile Web)
echo "Maintainer:" $(zaf_ctrl_get_option $cfile Maintainer) echo " Maintainer:" $(zaf_ctrl_get_option $cfile Maintainer)
items=$(zaf_list_plugin_items $1) items=$(zaf_list_plugin_items $1)
echo echo " Supported items:"
echo "Supported items:"
for i in $items; do for i in $items; do
if [ -n "$tst" ]; then if [ -n "$tst" ]; then
${ZAF_AGENT_BIN} -t "$1.$i" echo -n " "; ${ZAF_AGENT_BIN} -t "$1.$i"
else else
echo -n "$1.$i: " echo -n " $1.$i: "
fi fi
echo echo
zaf_ctrl_get_description "$cfile" "Item: $i"; zaf_ctrl_get_description "$cfile" "Item: $i";