From f110e9aec71fc2b4e36d0e49c15f3872d717fd7f Mon Sep 17 00:00:00 2001
From: Lukas Macura <lukas@macura.cz>
Date: Fri, 17 Jun 2016 14:06:27 +0200
Subject: [PATCH] Repaired version numbers

---
 README.md  | 10 +++++-----
 install.sh |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c9bc4d4..cff3eb4 100644
--- a/README.md
+++ b/README.md
@@ -28,18 +28,18 @@ 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/1.3/install.sh | sh
+curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | 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/1.3/install.sh | \
+curl -k https://raw.githubusercontent.com/limosek/zaf/master/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 1.3
+git clone https://github.com/limosek/zaf.git; cd zaf; git checkout master
 
 ./install.sh {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Server-Options] [Zaf-Options]
  Agent-Options: Z_Option=value [...]
@@ -72,7 +72,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/1.3/install.sh | sh -s auto \
+curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh -s auto \
   Z_Server=zabbix.server.local \
   Z_ServerActive=zabbix.server.local \
   Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \
@@ -84,7 +84,7 @@ 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 1.3 \
+ && git checkout master \
  && git clone https://github.com/limosek/zaf-plugins.git \
  && make deb PLUGINS="./zaf-plugins/fsx" IPLUGINS="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
diff --git a/install.sh b/install.sh
index 0ca18d6..df49095 100755
--- a/install.sh
+++ b/install.sh
@@ -372,8 +372,7 @@ zaf_postconfigure() {
 
 if ! [ -f README.md ]; then
 	# Hardcoded variables
-	ZAF_VERSION="1.2"
-	ZAF_GITBRANCH="1.2"
+	ZAF_VERSION="1.3"
 	ZAF_URL="https://github.com/limosek/zaf"
 	ZAF_RAW_URL="https://raw.githubusercontent.com/limosek/zaf"
 	export ZAF_TMP_DIR="/tmp/zaf-installer"