zabbix
/
limosek-zaf
mirror of https://github.com/limosek/zaf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Repaired postinst and dpkg check

1.2
Lukas Macura 2016-04-18 11:51:24 +02:00
parent a320c33d44
commit da87113b47
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -53,7 +53,10 @@ deb-control:
deb-scripts:
@. lib/zaf.lib.sh; \
. lib/ctrl.lib.sh; \
cat files/postinst.template | zaf_far '{PLUGINS}' "$(PLUGINS)" | zaf_far "{IPLUGINS}" "$(IPLUGINS)" | zaf_far '{ZAF_LIB_DIR}' "/usr/lib/zaf" >$(DEBIAN_CTRL)/postinst
cat files/postinst.template | \
zaf_far '{PLUGINS}' "$$(for p in $(PLUGINS); do echo $$(basename $$p); done)" | \
zaf_far '{IPLUGINS}' "$$(for p in $(IPLUGINS); do echo $$(basename $$p); done)" | \
zaf_far '{ZAF_LIB_DIR}' "/usr/lib/zaf" >$(DEBIAN_CTRL)/postinst
@chmod +x $(DEBIAN_CTRL)/postinst
@cp files/preinst.template $(DEBIAN_CTRL)/preinst
@chmod +x $(DEBIAN_CTRL)/preinst

7
files/postinst.template
View File

@ -8,7 +8,12 @@ configure)
. /usr/lib/zaf/os.lib.sh
. /usr/lib/zaf/ctrl.lib.sh
cd /usr/lib/zaf && /usr/lib/zaf/install.sh reconf
[ -n "{PLUGINS}" ] && zaf reinstall {PLUGINS} {IPLUGINS}
[ -n "{PLUGINS}" ] && for p in {PLUGINS}; do
if ! is_plugin $p;then
zaf install $ZAF_PREPACKAGED_DIR/$p;
fi
done
[ -n "{IPLUGINS}" ] && zaf reinstall {IPLUGINS}
fi
;;
esac

2
lib/os.lib.sh
View File

@ -130,7 +130,7 @@ zaf_install_agent_opkg() {
# $* - packages
zaf_check_deps_dpkg() {
for i in $*; do
dpkg-query -f '${Status},${Package}\n' -W $* 2>/dev/null | grep -q "^install ok"
dpkg-query -f '${Status},${Package}\n' -W $* 2>/dev/null | grep -q "^install ok installed"
done
}