mixlib-install 3.10.0 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407472a1b2344181b46f4af9bbf72e4752f0e14f8ee2a51e4011b176f38372d0
-  data.tar.gz: e37d348ed08c6530c62c973f5c6a3f98245ff13de1860c76c38637e14aedc6ca
+  metadata.gz: e9a606a7e28832772a38e93bebd0436065203a9a5a1e519c7f653ff3f3d9a807
+  data.tar.gz: 46c71526acee3e61cff2117847b62487b41bb2b05b0e2c228944d76fc3a22a64
 SHA512:
-  metadata.gz: 0a78fdf61ac0aed3c9fac2325e616062cdeebc5ed29d8bc783c9a8b22e1291a436c7fb0ddb7dc690e6189082ccbf14276e73bad17e298d60f6b4451793af0be3
-  data.tar.gz: 31937366eb1139bcdac64d655f31f499a22e99d3660b19c3b630fb17936e1cb36032a8dcea11a2f236ccca44ac3214d79640782ad8ee0dc064ce9d4da981777c
+  metadata.gz: d1035dd59c985003766ea3fdb26b4b5f1d98ea4b9d15ea82a3308ec668733b5717f76cfe63e329a61c68afcb11a50de08a2b816c76fe5213eec2522307a2cba3
+  data.tar.gz: 5f4c7f9e1079283dbeaf30483c48e73ff720889a39bb829de4193e47b46c96c25b78fd15864a6758d272a4eda482cb1dce0dd746de55c9739bebea63b77881e4

data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -47,14 +47,6 @@ elif test -f "/etc/redhat-release"; then
   platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]'`
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
 
-  # If /etc/redhat-release exists, we act like RHEL by default
-  if test "$platform" = "fedora"; then
-    # FIXME: stop remapping fedora to el
-    # FIXME: remove client side platform_version mangling and hard coded yolo
-    # Change platform version for use below.
-    platform_version="6.0"
-  fi
-
   if test "$platform" = "xenserver"; then
     # Current XenServer 6.2 is based on CentOS 5, platform is not reset to "el" server should hanlde response
     platform="xenserver"
@@ -66,16 +58,15 @@ elif test -f "/etc/redhat-release"; then
 elif test -f "/etc/system-release"; then
   platform=`sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
-  # amazon is built off of fedora, so act like RHEL
-  # Version 1. Example: Amazon Linux AMI release 2017.09
-  if test "$platform" = "amazon linux ami"; then
-    platform="el"
-    platform_version="6.0"
-  # Version 2. Example: Amazon Linux release 2.0 (2017.12)
-  elif test "$platform" = "amazon linux"; then
-    platform="el"
-    platform_version="7.0"
-  fi
+  case $platform in amazon*) # sh compat method of checking for a substring
+    # use the version value out of /etc/os-release if available since it isn't regex fragile
+    platform="amazon"
+    if test -f "/etc/os-release"; then
+      . /etc/os-release
+      platform_version=$VERSION_ID
+    fi
+  esac
+
 # Apple OS X
 elif test -f "/usr/bin/sw_vers"; then
   platform="mac_os_x"

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.10.0"
+    VERSION = "3.11.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout