commit 800dd07587f954e4865a27ab2e77d0a239fcbb62
author Petr Michalec <epcim@apealive.net> Wed Nov 15 17:19:26 2017 +0100
committer Petr Michalec <epcim@apealive.net> Wed Nov 15 17:19:26 2017 +0100
tree 89214e2a41aae084b4525a774085219eee1c4c1b
parent e07cd0b323a664770e3eec2b3863e35fe9d34f24

Install reclass only from install_reclass function

Change-Id: Ic799538a31bc4c9f3a4318705cf9effd1eaec9c6

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 8f82cc8..b35b879 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -379,11 +379,19 @@
 {
   VERSION=${1:-$RECLASS_VERSION}
   VERSION=${VERSION:-master}
-  # tries to replace all local version system version
-  for s in $(python -c "import site; print(' '.join(site.getsitepackages()))"); do
-    sudo -H pip install --upgrade --force-reinstall -I \
-    -t "$s" git+https://github.com/salt-formulas/reclass.git@${VERSION};
-  done
+  case ${VERSION} in
+      pkg|package)
+        which reclass || $SUDO $PKGTOOL install -y reclass
+        ;;
+      *)
+        # For dev/git/pip version...
+        # Note: It replaces all local reclass versions on system
+        for s in $(python -c "import site; print(' '.join(site.getsitepackages()))"); do
+          sudo -H pip install --upgrade --force-reinstall -I \
+            -t "$s" git+https://github.com/salt-formulas/reclass.git@${VERSION};
+        done
+        ;;
+  esac
 }
 
 install_salt_master_pkg()
@@ -397,12 +405,10 @@
     case $PLATFORM_FAMILY in
       debian)
           $SUDO apt-get install -y git
-	  which reclass || $SUDO apt install -qqq -y reclass
           curl -L https://bootstrap.saltstack.com | $SUDO sh -s -- -M ${BOOTSTRAP_SALTSTACK_OPTS} &>/dev/null || true
         ;;
       rhel)
           yum install -y git
-          which reclass || $SUDO yum install -y reclass
           curl -L https://bootstrap.saltstack.com | $SUDO sh -s -- -M ${BOOTSTRAP_SALTSTACK_OPTS} &>/dev/null || true
         ;;
     esac
@@ -427,11 +433,9 @@
     case $PLATFORM_FAMILY in
       debian)
           $SUDO apt-get install -y python-pip python-dev zlib1g-dev git
-	  which reclass || $SUDO apt-get install -y reclass
         ;;
       rhel)
 	  $SUDO yum install -y git
-	  which reclass || $SUDO yum install -y reclass
         ;;
     esac
 
@@ -590,7 +594,7 @@
         fi
     }
 
-    if [[ $RECLASS_VERSION =~ ^(dev|devel|master)$ ]]; then
+    if [[ $RECLASS_VERSION =~ ^(dev|devel|develop|master)$ ]]; then
       log_warn "Install development version of reclass"
       install_reclass ${RECLASS_VERSION/dev*/develop}
     fi