From 2e49173293e5e73dfc6f68b7f749a0ea1a4a89c9 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Thu, 22 Dec 2016 10:13:01 -0700
Subject: [PATCH] Various fixes from PR review:

- Update Linux Mint supported versions in README file
- Remove if statement restricting archive.ubuntu.com repository addition
- Remove old-releases.ubuntu.com repository addition
- Remove some unnecessary parens in an if statement && clause
- Add the python-software-properties install logic back in for Ubutu 12
- Remove the workaround for starting deamons for older versions (no longer applicable)
- Fix architecture spelling in README file
---
 README.rst        |  6 +++---
 bootstrap-salt.sh | 22 ++++++++--------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/README.rst b/README.rst
index c31058e..93e2f3b 100644
--- a/README.rst
+++ b/README.rst
@@ -216,8 +216,8 @@ Debian and derivatives
 .. note::
 
   Installation of Salt packages on Debian 8 based distribution from repo.saltstack.com repository
-  is currently supported for ``amd64`` (``x86-64``) and ``armhf`` architechtures ONLY. Use ``git``
-  bootstrap mode as described above to install Salt on other architechtures, such as ``i386`` or
+  is currently supported for ``amd64`` (``x86-64``) and ``armhf`` architectures ONLY. Use ``git``
+  bootstrap mode as described above to install Salt on other architectures, such as ``i386`` or
   ``armel``. You also may need to disable repository configuration and allow ``pip`` installations
   by providing ``-r`` and ``-P`` options to the bootstrap script, i.e.:
 
@@ -251,7 +251,7 @@ Ubuntu and derivatives
 
 - Elementary OS 0.2 (based on Ubuntu 12.04)
 - Linaro 12.04
-- Linux Mint 13/14/16/17/18
+- Linux Mint 13/17/18
 - Trisquel GNU/Linux 6 (based on Ubuntu 12.04)
 - Ubuntu 12.04/14.04/16.04
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 65f69ac..ea2cd48 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2294,12 +2294,7 @@ __enable_universe_repository() {
 
     echodebug "Enabling the universe repository"
 
-    # Ubuntu versions higher than 12.04 do not live in the old repositories
-    if [ "$DISTRO_MAJOR_VERSION" -gt 12 ]; then
-        add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
-    fi
-
-    add-apt-repository -y "deb http://old-releases.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
+    add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
 
     return 0
 }
@@ -2364,7 +2359,7 @@ install_ubuntu_deps() {
 }
 
 install_ubuntu_stable_deps() {
-    if ([ "${_SLEEP}" -eq "${__DEFAULT_SLEEP}" ] && [ "$DISTRO_MAJOR_VERSION" -lt 16 ]); then
+    if [ "${_SLEEP}" -eq "${__DEFAULT_SLEEP}" ] && [ "$DISTRO_MAJOR_VERSION" -lt 16 ]; then
         # The user did not pass a custom sleep value as an argument, let's increase the default value
         echodebug "On Ubuntu systems we increase the default sleep value to 10."
         echodebug "See https://github.com/saltstack/salt/issues/12248 for more info."
@@ -2450,7 +2445,12 @@ install_ubuntu_stable_deps() {
 install_ubuntu_daily_deps() {
     install_ubuntu_stable_deps || return 1
 
-    __apt_get_install_noinput software-properties-common || return 1
+    if [ "$DISTRO_MAJOR_VERSION" -gt 12 ]; then
+        __apt_get_install_noinput software-properties-common || return 1
+    else
+        # Ubuntu 12.04 needs python-software-properties to get add-apt-repository binary
+        __apt_get_install_noinput python-software-properties || return 1
+    fi
 
     if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
         __enable_universe_repository || return 1
@@ -2559,12 +2559,6 @@ install_ubuntu_git() {
 }
 
 install_ubuntu_stable_post() {
-    # Workaround for latest LTS packages on latest ubuntu. Normally packages on
-    # debian-based systems will automatically start the corresponding daemons
-    if [ "$DISTRO_MAJOR_VERSION" -lt 16 ]; then
-        return 0
-    fi
-
     for fname in api master minion syndic; do
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue