Removed autoinstallation of zabbix package in debian

README.md

@@ -28,26 +28,26 @@ So zaf is here for you :)
 ## Installing Zaf
 You need to be root and you must have curl installed on your system. Depending on your system, github certificates may not be available so you have to use *-k* option for curl (insecure). Default installation type is silent. So there will be no questions and everything will be autodetected. This simple command should be used on most systems:
 ```
-curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh
+curl -k https://raw.githubusercontent.com/limosek/zaf/1.3/install.sh | sh
 ```
 If you have only wget installed:
 ```
-wget --no-check-certificate -O - https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh
+wget --no-check-certificate -O - https://raw.githubusercontent.com/limosek/zaf/1.3/install.sh | sh
 ```
 If you do not have https support (like openwrt), I made small http mirror of github files which is synchronized each day:
 ```
-wget -O - http://github.macura.cz/zaf/install.sh| ZAF_RAW_URL=http://github.macura.cz/zaf/ ZAF_REPO_URL=http://github.macura.cz/zaf-plugins/ sh 
+wget -O - http://github.macura.cz/zaf/1.3/install.sh| ZAF_URL=http://github.macura.cz/zaf/ ZAF_REPO_URL=http://github.macura.cz/zaf-plugins/1.3/ sh
 ```
 
 ### Install options and autoconfiguration
 General parameters for install.sh on any system (simplest way how to install)
 ```
-curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | \
+curl -k https://raw.githubusercontent.com/limosek/zaf/1.3/install.sh | \
    sh -s {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Server-Options] [Zaf-Options]
 ```
 or use git version:
 ```
-git clone https://github.com/limosek/zaf.git; cd zaf; git checkout master
+git clone https://github.com/limosek/zaf.git; cd zaf; git checkout 1.3
 
 ./install.sh {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Server-Options] [Zaf-Options]
  Agent-Options: Z_Option=value [...]
@@ -74,7 +74,7 @@ ZAF_CACHE_DIR|Cache directory|/tmp/zafc
 ZAF_LIB_DIR|Libraries directory|/usr/lib/zaf
 ZAF_PLUGINS_DIR|Plugins directory|${ZAF_LIB_DIR}/plugins
 ZAF_PROXY|http[s] and ftp proxy used by zaf|empty	
-ZAF_REPO_URL|Plugins http[s] repository|https://raw.githubusercontent.com/limosek/zaf-plugins/master/
+ZAF_REPO_URL|Plugins http[s] repository|https://raw.githubusercontent.com/limosek/zaf-plugins/1.3/
 ZAF_REPO_DIR|Plugins directory|${ZAF_LIB_DIR}/repo
 ZAF_AGENT_CONFIG|Zabbix agent config|/etc/zabbix/zabbix_agentd.conf
 ZAF_AGENT_CONFIGD|Zabbix agent config.d|/etc/zabbix/zabbix_agentd.conf.d/
@@ -98,7 +98,7 @@ Now everything was tested on Debian and OpenWrt. If somebody is interrested in,
 Suppose you want to autoinstall agent on clean system. You need only curl installed. Everything else is one-cmd process.
 This command will install zaf, install zabbix-agent if necessary and sets zabbix variables on agent to reach server. This command can be automatized by puppet or another deploying system.
 ```
-curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh -s auto \
+curl -k https://raw.githubusercontent.com/limosek/zaf/1.3/install.sh | sh -s auto \
   Z_Server=zabbix.server.local \
   Z_ServerActive=zabbix.server.local \
   Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \
@@ -110,10 +110,10 @@ You can make your own deb package with preconfigured option. It is up to you to
 ```
 git clone https://github.com/limosek/zaf.git \
  && cd zaf \
- && git checkout master \
+ && git checkout 1.3 \
  && git clone https://github.com/limosek/zaf-plugins.git \
  && make deb PLUGINS="./zaf-plugins/fsx" ZAF_PLUGINS="zaf" ZAF_OPTIONS="ZAF_GIT=0" AGENT_OPTIONS="Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_StartAgents=8"
-sudo dpkg -i out/zaf-1.3master.deb
+sudo dpkg -i out/zaf-1.3.deb
 ```
 General usage:
 ```
@@ -154,7 +154,7 @@ During plugin installation, zaf will check all dependencies, do install binaries
 Zaf binary can be installed on any system from openwrt to big system. It has minimal dependencies and is shell based. Is has minimal size (up to 50kb of code). It can be used for installing, removing and testing zaf plugin items. Zaf should be run as root.
 ```
 ./zaf 
-./zaf Version 1.3master. Please use some of this commands:
+./zaf Version 1.3. Please use some of this commands:
 ./zaf Cmd [ZAF_OPTION=value] [ZAF_CTRL_Option=value] [ZAF_CTRLI_Item_Option=value] ...
 Plugin manipulation commands:
 ./zaf update                            To update repo (not plugins, similar to apt-get update)                         

install.sh

@@ -9,7 +9,7 @@ if [ -z "$ZAF_RAW_URL" ]; then
 	ZAF_RAW_URL="https://raw.githubusercontent.com/limosek/zaf"
 fi
 
-[ -z "$ZAF_GITBRANCH" ] && ZAF_GITBRANCH=master
+[ -z "$ZAF_GITBRANCH" ] && ZAF_GITBRANCH=1.3
 
 ############### Functions
 
@@ -267,7 +267,7 @@ zaf_configure(){
 	zaf_get_option ZAF_PLUGINS_DIR "Plugins directory" "${ZAF_LIB_DIR}/plugins" "$INSTALL_MODE"
 	[ "${ZAF_GIT}" = 1 ] && zaf_get_option ZAF_REPO_GITURL "Git plugins repository" "https://github.com/limosek/zaf-plugins.git" "$INSTALL_MODE"
 	zaf_get_option ZAF_PROXY "http proxy used by zaf" "" "$INSTALL_MODE"
-	zaf_get_option ZAF_REPO_URL "Plugins http[s] repository" "https://raw.githubusercontent.com/limosek/zaf-plugins/master/" "$INSTALL_MODE"
+	zaf_get_option ZAF_REPO_URL "Plugins http[s] repository" "https://raw.githubusercontent.com/limosek/zaf-plugins/${ZAF_VERSION}/" "$INSTALL_MODE"
 	zaf_get_option ZAF_REPO_DIR "Plugins directory" "${ZAF_LIB_DIR}/repo" "$INSTALL_MODE"
 
 	zaf_get_option ZAF_AGENT_CONFIG "Zabbix agent config" "/etc/zabbix/zabbix_agentd.conf" "$INSTALL_MODE"

lib/ctrl.lib.sh

@@ -216,8 +216,8 @@ zaf_ctrl_install() {
 	done
 	files=$(zaf_ctrl_get_global_option $2 "Install-files")
 	for f in $files; do
-		zaf_fetch_url "$1/$b" >"${ZAF_TMP_DIR}/$b"
-                zaf_install "${ZAF_TMP_DIR}/$b" "$pdir"
+		zaf_fetch_url "$1/$f" >"${ZAF_TMP_DIR}/$f"
+                zaf_install "${ZAF_TMP_DIR}/$f" "$pdir"
 	done
 	true
 	) || zaf_err "Error during zaf_ctrl_install"
@@ -245,6 +245,7 @@ zaf_ctrl_generate_items_cfg() {
 	(set -e
 	for i in $items; do
             iscript=$(zaf_stripctrl $i)
+	    zafparams=""
 	    zaf_ctrl_get_item_option $1 $i "Parameters" >$tmpfile
 	    if [ -s "$tmpfile" ]; then
 		ikey="$2.$i[*]"

lib/os.lib.sh

@@ -140,15 +140,6 @@ zaf_uninstall(){
     fi
 }
 
-# Automaticaly install agent on debian
-# For another os, create similar function (install_zabbix_centos)
-zaf_install_agent_debian() {
-    zaf_fetch_url "http://repo.zabbix.com/zabbix/3.0/debian/pool/main/z/zabbix-release/zabbix-release_3.0-1+${ZAF_OS_CODENAME}_all.deb" >"/tmp/zaf-installer/zabbix-release_3.0-1+${ZAF_OS_CODENAME}_all.deb" \
-	&& dpkg -i "/tmp/zaf-installer/zabbix-release_3.0-1+${ZAF_OS_CODENAME}_all.deb" \
-	&& apt-get update \
-	&& apt-get install -y -q $ZAF_AGENT_PKG
-}
-
 zaf_install_agent_opkg() {
     opkg update && \
     opkg install $ZAF_AGENT_PKG
@@ -158,7 +149,7 @@ zaf_install_agent_opkg() {
 # $* - packages
 zaf_check_deps_dpkg() {
 	for i in $*; do
-		dpkg-query -f '${db:Status-Status},${Package}\n' -W $* 2>/dev/null | grep -q "^installed" 
+		dpkg-query -f '${db:Status-Status},${Package}\n' -W $* 2>/dev/null | grep -qE "^(installed|^,)"
 	done
 }
 

lib/plugin.lib.sh

@@ -81,7 +81,7 @@ zaf_prepare_plugin() {
 	url=$(zaf_get_plugin_url "$1")/control.zaf || exit $?
 	plugindir="$2"
 	control=${plugindir}/control.zaf
-	if [ "$(zaf_url_info $1)" = "path" ] && cmp -s "$url" "$control"; then
+	if [ "$(zaf_url_info $1)" = "path" ] && [ "$url" = "$control" ]; then
 		zaf_err "prepare_plugin: Cannot install from itself!"
 	fi
 	zaf_install_dir "$plugindir"

lib/zaf.lib.sh

@@ -1,7 +1,7 @@
 
 # Hardcoded variables
 ZAF_VERSION="1.3"
-ZAF_GITBRANCH="master"
+ZAF_GITBRANCH="1.3"
 ZAF_URL="https://github.com/limosek/zaf"
 ZAF_RAW_URL="https://raw.githubusercontent.com/limosek/zaf"
 

zaf

@@ -75,7 +75,7 @@ cache-test2)
 	;;
 
 version)
-	echo "$ZAF_VERSION<git $ZAF_GITBRANCH>"
+	echo "$ZAF_VERSION"
 	[ $ZAF_DEBUG -gt 1 ] && set |grep -E ^ZAF_ 
 	;;