mixlib-install 2.1.1 → 2.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2c1268ffb5cddeeb84f766f54857d73636e7955c
4
- data.tar.gz: b4ee9a98f94b696ab347bf05892dbdcd3e01372a
3
+ metadata.gz: f7dbbaa531b4d85be6a4198ed08627cdc38804b3
4
+ data.tar.gz: 47b854df4365270e6566bb04ae322d52d10f1abb
5
5
  SHA512:
6
- metadata.gz: 5cd802741f2740e5ea9b4842dea40f9be73e0309eee9b3fe9faba207a5da9bab73274dc8c685d8f3bc8ebc4084dd81e4f1bc6b53f4e8629b448a0ce3fe17a5b3
7
- data.tar.gz: 6bbc62c1c7b4013910080bbe881479f68bfc3c5854d5e37b2ec59e62393496dcb64b585103c94668a8e1380e792623f1b177d4bbf59564f0151079b6d5176e66
6
+ metadata.gz: 9b27240f21cc8480fad46114f6c6a3546b670728a9180f3216e3c8a330488132a83c2ac8bbd6031d6c220fa451dc97e8ed7c18536858c32a74919554d734cba8
7
+ data.tar.gz: 6414e414b71fabea427c5c4fb75f65e1d62516942ed79a5da8e866c7209f9e5aa291ae8cf0c6871d8ed298682f2f47fb33f20cd9ccdd623c7755852d6124c2b3
@@ -1,5 +1,9 @@
1
1
  # Change Log
2
2
 
3
+ ## [2.1.2]
4
+ - Add Cumulus Linux and Cumulus Networks platform support
5
+ - Fix Arista EOS platform detection ordering
6
+
3
7
  ## [2.1.1]
4
8
  - Add `mixlib-install` command line utility
5
9
 
@@ -28,9 +28,21 @@ os=`uname -s`
28
28
  if test -f "/etc/lsb-release" && grep -q DISTRIB_ID /etc/lsb-release && ! grep -q wrlinux /etc/lsb-release; then
29
29
  platform=`grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]'`
30
30
  platform_version=`grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2`
31
+
32
+ if test "$platform" = "cumulus linux"; then
33
+ platform="cumulus_linux"
34
+ elif test "$platform" = "cumulus networks"; then
35
+ platform="cumulus_networks"
36
+ fi
37
+
31
38
  elif test -f "/etc/debian_version"; then
32
39
  platform="debian"
33
40
  platform_version=`cat /etc/debian_version`
41
+ elif test -f "/etc/Eos-release"; then
42
+ # EOS may also contain /etc/redhat-release so this check must come first.
43
+ platform=arista_eos
44
+ platform_version=`awk '{print $4}' /etc/Eos-release`
45
+ machine="i386"
34
46
  elif test -f "/etc/redhat-release"; then
35
47
  platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]'`
36
48
  platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
@@ -96,10 +108,6 @@ elif test "x$os" = "xAIX"; then
96
108
  platform="aix"
97
109
  platform_version="`uname -v`.`uname -r`"
98
110
  machine="powerpc"
99
- elif test -f "/etc/Eos-release"; then
100
- platform=arista_eos
101
- platform_version=`awk '{print $4}' /etc/Eos-release`
102
- machine="i386"
103
111
  elif test -f "/etc/os-release"; then
104
112
  . /etc/os-release
105
113
  if test "x$CISCO_RELEASE_INFO" != "x"; then
@@ -1,5 +1,5 @@
1
1
  module Mixlib
2
2
  class Install
3
- VERSION = "2.1.1"
3
+ VERSION = "2.1.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mixlib-install
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thom May
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-10-10 00:00:00.000000000 Z
12
+ date: 2016-10-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: artifactory