mixlib-install 3.12.3 → 3.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9292398c41cc34a46a603c508a55b865da85bf161780dc19892fe9ae3607319
-  data.tar.gz: 767131ab311ea5ef51c3aef89f40beca0634aabacb6d0c4cdd60a9ba233cec49
+  metadata.gz: fb233e51e18e929105c7c97d7f1ca060e4dc02bb31c96fe593bdcda077e7f57a
+  data.tar.gz: 874ef20231f17e3bf00a0b5f9a8f6ad6c428793be44a897edb1b878449cdf86e
 SHA512:
-  metadata.gz: f1c4f472513b0f4a61463f6314781f59c088b934a5ac8a9f812152dc4ae70f25647ce164e9856f4f7dc62ec4c3eccb3c34ddda2a990c56f1368476d25cc8e8dc
-  data.tar.gz: b6d9ff5a37a56484aa7028aa61421ffde2a6acd2f32d97cde6abfed658c74cb63402999b98d28f5e2d3999102ac8b9ff3aa868da7bef1afd5b33568e24c28cba
+  metadata.gz: 267808104df5f1e62d9a11b067ed53f75bf540465b5a1a5065d76dacb7618ba20acc381616a19d287d8dcbc996b2ee94fe53ca5e8f7856512abad827ad69a3c5
+  data.tar.gz: 123e1017d5c41f2a02be2723e8cacda065363ef5bd6f3af858e46c38a0099ead3bf7b8d2a687dbd4206e4986d0798d19f76014f5fc53c096b66a956b956ac793

data/lib/mixlib/install.rb

@@ -25,6 +25,7 @@ require_relative "install/options"
 require_relative "install/generator"
 require_relative "install/generator/bourne"
 require_relative "install/generator/powershell"
+require_relative "install/dist"
 
 module Mixlib
   class Install
@@ -119,7 +120,7 @@ module Mixlib
       # This only works for chef and chefdk but they are the only projects
       # we are supporting as of now.
       if options.for_ps1?
-        "$env:systemdrive\\opscode\\#{options.product_name}"
+        "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{options.product_name}"
       else
         "/opt/#{options.product_name}"
       end
@@ -136,7 +137,7 @@ module Mixlib
       # chef-server -> /opt/opscode). But this is OK for now since
       # chef & chefdk are the only supported products.
       version_manifest_file = if options.for_ps1?
-                                "$env:systemdrive\\opscode\\#{options.product_name}\\version-manifest.json"
+                                "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{options.product_name}\\version-manifest.json"
                               else
                                 "/opt/#{options.product_name}/version-manifest.json"
                               end

data/lib/mixlib/install/dist.rb

@@ -24,6 +24,8 @@ module Mixlib
       MACOS_VOLUME = "chef_software".freeze
       # Windows install directory name
       WINDOWS_INSTALL_DIR = "opscode".freeze
+      # Linux install directory name
+      LINUX_INSTALL_DIR = "/opt"
     end
   end
 end

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

@@ -76,12 +76,6 @@ elif test -f "/usr/bin/sw_vers"; then
   platform="mac_os_x"
   # Matching the tab-space with sed is error-prone
   platform_version=`sw_vers | awk '/^ProductVersion:/ { print $2 }' | cut -d. -f1,2`
-
-  # x86_64 Apple hardware often runs 32-bit kernels (see OHAI-63)
-  x86_64=`sysctl -n hw.optional.x86_64`
-  if test $x86_64 -eq 1; then
-    machine="x86_64"
-  fi
 elif test -f "/etc/release"; then
   machine=`/usr/bin/uname -p`
   if grep SmartOS /etc/release >/dev/null; then

data/lib/mixlib/install/script_generator.rb

@@ -19,6 +19,7 @@
 
 require_relative "util"
 require_relative "generator/powershell"
+require_relative "dist"
 require "cgi"
 
 module Mixlib
@@ -83,9 +84,9 @@ module Mixlib
         @sudo_command = "sudo -E"
 
         @root = if powershell
-                  "$env:systemdrive\\opscode\\chef"
+                  "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
                 else
-                  "/opt/chef"
+                  "#{Mixlib::Install::Dist::LINUX_INSTALL_DIR}/#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
                 end
 
         parse_opts(opts)

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.12.3"
+    VERSION = "3.12.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.12.3
+  version: 3.12.5
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout