From 1f128dd8126883a2321459aaa2f6d5528cc2fe6e Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Mon, 11 Jul 2016 14:16:48 +0300
Subject: [PATCH] Set STABLE_REV variable to "latest" early, properly fixes git
 bootstraps

---
 bootstrap-salt.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index a095666..92d220d 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -265,13 +265,13 @@ __usage() {
     - ${__ScriptName}
     - ${__ScriptName} stable
     - ${__ScriptName} stable 2016.3
-    - ${__ScriptName} stable 2016.3.0
+    - ${__ScriptName} stable 2016.3.1
     - ${__ScriptName} daily
     - ${__ScriptName} testing
     - ${__ScriptName} git
     - ${__ScriptName} git 2016.3
-    - ${__ScriptName} git v2016.3.0
-    - ${__ScriptName} git 11acecc43e2c2e4e9a0e73d76b46b035afe8d538
+    - ${__ScriptName} git v2016.3.1
+    - ${__ScriptName} git 06f249901a2e2f1ed310d58ea3921a129f214358
 
   Options:
     -h  Display this message
@@ -520,7 +520,7 @@ if [ "$ITYPE" = "git" ]; then
     fi
 
     # Disable shell warning about unbound variable during git install
-    STABLE_REV=""
+    STABLE_REV="latest"
 
 # If doing stable install, check if version specified
 elif [ "$ITYPE" = "stable" ]; then
@@ -2361,6 +2361,7 @@ install_ubuntu_stable_deps() {
             echoerror "repo.saltstack.com likely doesn't have all required 32-bit packages for Ubuntu $DISTRO_MAJOR_VERSION (yet?)."
         elif [ "$DPKG_ARCHITECTURE" != "amd64" ]; then
             echoerror "repo.saltstack.com doesn't have packages for your system architecture: $DPKG_ARCHITECTURE."
+            echoerror "You can try git installation mode, i.e.: sh ${__ScriptName} git v2016.3.1"
             exit 1
         fi
 
@@ -2762,7 +2763,7 @@ install_debian_7_deps() {
 
         if [ "$DPKG_ARCHITECTURE" = "i386" ]; then
             echoerror "repo.saltstack.com likely doesn't have all required 32-bit packages for Debian $DISTRO_MAJOR_VERSION (yet?)."
-            echoerror "You can try git installation mode, i.e.: sh ${__ScriptName} git v2016.3.0"
+            echoerror "You can try git installation mode, i.e.: sh ${__ScriptName} git v2016.3.1"
         elif [ "$DPKG_ARCHITECTURE" != "amd64" ]; then
             echoerror "repo.saltstack.com doesn't have packages for your system architecture: $DPKG_ARCHITECTURE."
 
@@ -2843,7 +2844,7 @@ install_debian_8_deps() {
 
         if [ "$DPKG_ARCHITECTURE" = "i386" ]; then
             echoerror "repo.saltstack.com likely doesn't have all required 32-bit packages for Debian $DISTRO_MAJOR_VERSION (yet?)."
-            echoerror "You can try git installation mode, i.e.: sh ${__ScriptName} git v2016.3.0"
+            echoerror "You can try git installation mode, i.e.: sh ${__ScriptName} git v2016.3.1"
         elif [ "$DPKG_ARCHITECTURE" != "amd64" ]; then
             echoerror "repo.saltstack.com doesn't have packages for your system architecture: $DPKG_ARCHITECTURE."
             echoerror "Try git installation mode and disable SaltStack apt repository, for example:"