mixlib-install 3.11.12 → 3.11.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -2
  3. data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh +3 -3
  4. data/lib/mixlib/install/generator/bourne/scripts/proxy_env.sh +16 -8
  5. data/lib/mixlib/install/util.rb +5 -2
  6. data/lib/mixlib/install/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a294802a906b6a0cf57c42dff0dc5e4661cb874830c2e185876a8fb146cb0bc2
4
- data.tar.gz: e64bbe3bf192a623f83bbbbc6bf134ef9be4605e143d8610ed40f3b39fd64e28
3
+ metadata.gz: e424fad8fbaf51b22e62040bdd6be52527b3ac3b89c208d9d489b49d0754b20d
4
+ data.tar.gz: a92e4226ccf717351fd23bd780a76b80cb8242ea9c5f0b527fab01b16c1f1eb5
5
5
  SHA512:
6
- metadata.gz: f58d8e8e3355cc779fda410fc7e6485a3c8260eebb4815a684a53849ab7a3ba9bd9ee615f4825445985bbf98a7cdcc99069ec0b458cffb80d32600d3369aa533
7
- data.tar.gz: 4ce72d73ba2232bff0fac8238225db4b92c6afa2357d1335edeb8e8551df7503e1602d7deb5f7146dcddbaebe29f11fe083139591ba652a1c7309d1a212a6653
6
+ metadata.gz: 5b66fe6f554472dafacecf28241329d745a6a2f1ecd4e75c74a32e6a0ab157129d6fcaa4c0b52a5c0d3e00a20c95f21b58307da603a7f943ff8bf7afa91c594f
7
+ data.tar.gz: 1a005bbba9a9c5e121e6bb8b9919f1880b92972aaebe7e613605846ca11c1f3271aefeef57959f79a0e56de7fbc5583a71bdc23a1f64d1a0dbc17c57ba39cf07
data/Gemfile CHANGED
@@ -12,8 +12,7 @@ group :test do
12
12
  gem "rake"
13
13
  gem "rspec"
14
14
  gem "vcr"
15
- gem "webmock", "~> 2.3.2" # ruby 1.9.3
16
- gem "addressable", "~> 2.4.0" # ruby 1.9.3
15
+ gem "webmock", "~> 3.4"
17
16
  gem "aruba", "~> 0.14"
18
17
  gem "cucumber", "~> 1.3.20"
19
18
  gem "climate_control"
data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh CHANGED
@@ -25,7 +25,7 @@
25
25
  machine=`uname -m`
26
26
  os=`uname -s`
27
27
 
28
- if test -f "/etc/lsb-release" && grep -q DISTRIB_ID /etc/lsb-release && ! grep -q wrlinux /etc/lsb-release; then
28
+ if test -f "/etc/lsb-release" && grep DISTRIB_ID /etc/lsb-release >/dev/null && ! grep wrlinux /etc/lsb-release >/dev/null; 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
31
 
@@ -84,7 +84,7 @@ elif test -f "/usr/bin/sw_vers"; then
84
84
  fi
85
85
  elif test -f "/etc/release"; then
86
86
  machine=`/usr/bin/uname -p`
87
- if grep -q SmartOS /etc/release; then
87
+ if grep SmartOS /etc/release >/dev/null; then
88
88
  platform="smartos"
89
89
  platform_version=`grep ^Image /etc/product | awk '{ print $3 }'`
90
90
  else
@@ -92,7 +92,7 @@ elif test -f "/etc/release"; then
92
92
  platform_version=`/usr/bin/uname -r`
93
93
  fi
94
94
  elif test -f "/etc/SuSE-release"; then
95
- if grep -q 'Enterprise' /etc/SuSE-release;
95
+ if grep 'Enterprise' /etc/SuSE-release >/dev/null;
96
96
  then
97
97
  platform="sles"
98
98
  platform_version=`awk '/^VERSION/ {V = $3}; /^PATCHLEVEL/ {P = $3}; END {print V "." P}' /etc/SuSE-release`
data/lib/mixlib/install/generator/bourne/scripts/proxy_env.sh CHANGED
@@ -5,24 +5,32 @@
5
5
 
6
6
  if test "x$https_proxy" != "x"; then
7
7
  echo "setting https_proxy: $https_proxy"
8
- export HTTPS_PROXY=$https_proxy
9
- export https_proxy=$https_proxy
8
+ HTTPS_PROXY=$https_proxy
9
+ https_proxy=$https_proxy
10
+ export HTTPS_PROXY
11
+ export https_proxy
10
12
  fi
11
13
 
12
14
  if test "x$http_proxy" != "x"; then
13
15
  echo "setting http_proxy: $http_proxy"
14
- export HTTP_PROXY=$http_proxy
15
- export http_proxy=$http_proxy
16
+ HTTP_PROXY=$http_proxy
17
+ http_proxy=$http_proxy
18
+ export HTTP_PROXY
19
+ export http_proxy
16
20
  fi
17
21
 
18
22
  if test "x$ftp_proxy" != "x"; then
19
23
  echo "setting ftp_proxy: $ftp_proxy"
20
- export FTP_PROXY=$ftp_proxy
21
- export ftp_proxy=$ftp_proxy
24
+ FTP_PROXY=$ftp_proxy
25
+ ftp_proxy=$ftp_proxy
26
+ export FTP_PROXY
27
+ export ftp_proxy
22
28
  fi
23
29
 
24
30
  if test "x$no_proxy" != "x"; then
25
31
  echo "setting no_proxy: $no_proxy"
26
- export NO_PROXY=$no_proxy
27
- export no_proxy=$no_proxy
32
+ NO_PROXY=$no_proxy
33
+ no_proxy=$no_proxy
34
+ export NO_PROXY
35
+ export no_proxy
28
36
  fi
data/lib/mixlib/install/util.rb CHANGED
@@ -66,10 +66,13 @@ module Mixlib
66
66
  env << Util.shell_env_var("https_proxy", opts[:https_proxy], powershell)
67
67
  env << Util.shell_env_var("HTTPS_PROXY", opts[:https_proxy], powershell)
68
68
  end
69
+ unless env.empty?
70
+ code = env.join("\n").concat("\n").concat(code)
71
+ end
69
72
  if powershell
70
- env.join("\n").concat("\n").concat(code)
73
+ "\n" + code
71
74
  else
72
- Util.wrap_command(env.join("\n").concat("\n").concat(code))
75
+ Util.wrap_command(code)
73
76
  end
74
77
  end
75
78
 
data/lib/mixlib/install/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Mixlib
2
2
  class Install
3
- VERSION = "3.11.12"
3
+ VERSION = "3.11.18"
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: 3.11.12
4
+ version: 3.11.18
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: 2019-04-15 00:00:00.000000000 Z
12
+ date: 2019-05-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mixlib-shellout