From 57f2edb9f57b67070d4fdf34b0e314c5079fae74 Mon Sep 17 00:00:00 2001
From: Lukas Macura <lukas@macura.cz>
Date: Thu, 7 Apr 2016 13:43:36 +0200
Subject: [PATCH] Repaired urls to work with 1.0

---
 README.md  | 12 ++++++------
 install.sh |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 1fa38a3..6f59838 100644
--- a/README.md
+++ b/README.md
@@ -26,18 +26,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/master/install.sh | sh
+curl -k https://raw.githubusercontent.com/limosek/zaf/1.0/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/master/install.sh | \
+curl -k https://raw.githubusercontent.com/limosek/zaf/1.0/install.sh | \
    sh -s {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Zaf-Options]
 ```
 or use git version:
 ```
-git clone https://github.com/limosek/zaf.git
+git clone https://github.com/limosek/zaf.git; cd zaf; git checkout 1.0
 ./install.sh {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Zaf-Options]
  Agent-Options: A_Option=value [...]
  Zaf-Options: ZAF_OPT=value [...]
@@ -52,7 +52,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.0/install.sh | sh -s auto \
   Z_Server=zabbix.server.local \
   Z_ServerActive=zabbix.server.local \
   Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \
@@ -60,9 +60,9 @@ curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh -s
 ```
 
 ### Packaged version
-You can make your own deb package with preconfigured option. It is up to you to put it to right repository and install. 
+You can make your own deb package with preconfigured option. It is up to you to put it to right APT repository and install. 
 ```
-git clone https://github.com/limosek/zaf.git
+git clone https://github.com/limosek/zaf.git; cd zaf; git checkout 1.0; cd ..
 git clone https://github.com/limosek/zaf-plugins.git
 cd zaf && make deb PLUGINS="$PWD/../zaf-plugins/zaf $PWD/../zaf-plugins/fsx" ZAF_OPTIONS="ZAF_GIT=0" AGENT_OPTIONS="Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_StartAgents=8"
 sudo dpkg -i out/zaf.deb
diff --git a/install.sh b/install.sh
index 51269c9..5be3d80 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,7 @@
 
 if [ -z "$ZAF_URL" ]; then
 	# Runing as standalone install.sh. We have to download rest of files first.
-	[ -z "$ZAF_VERSION" ] && ZAF_VERSION=master
+	[ -z "$ZAF_VERSION" ] && ZAF_VERSION=1.0
 	ZAF_URL="https://github.com/limosek/zaf/"
 fi
 
@@ -19,7 +19,7 @@ zaf_fetch_url(){
 # Download tgz and extract to /tmp/zaf-installer
 zaf_download_files() {
 	rm -rf /tmp/zaf-installer
-	zaf_fetch_url $ZAF_URL/archive/$ZAF_VERSION.tar.gz | tar -C /tmp -zx && mv /tmp/zaf-$ZAF_VERSION /tmp/zaf-installer
+	zaf_fetch_url $ZAF_URL/archive/$ZAF_VERSION.tar.gz | tar -f - -C /tmp -zx && mv /tmp/zaf-$ZAF_VERSION /tmp/zaf-installer
 }
 
 if ! [ -f README.md ]; then