Merge pull request #523 from klab-systems/bugfix_issue364

Resolve 7zip command checks for proper PS fallback
voxpupuli · Jun 26, 2024 · 4225c6e · 4225c6e
2 parents 91306b9 + 7d6429a
commit 4225c6e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/puppet_x/bodeco/archive.rb b/lib/puppet_x/bodeco/archive.rb
@@ -61,12 +61,12 @@ def extract(path = root_dir, opts = {})
       private
 
       def win_7zip
-        if ENV['path'].include?('7-Zip') || system('where 7z.exe')
+        if system('where 7z.exe')
           '7z.exe'
-        elsif File.directory?('C:\\Program Files\\7-Zip')
-          'C:\\Program Files\\7-Zip\\7z.exe'
-        elsif File.directory?('C:\\Program Files (x86)\\7-zip')
-          'C:\\Program Files (x86)\\7-Zip\\7z.exe'
+        elsif File.exist?('C:\Program Files\7-Zip\7z.exe')
+          'C:\Program Files\7-Zip\7z.exe'
+        elsif File.exist?('C:\Program Files (x86)\7-zip\7z.exe')
+          'C:\Program Files (x86)\7-Zip\7z.exe'
         elsif @file_path =~ %r{.zip"$}
           # Fallback to powershell for zipfiles - this works with windows
           # 2012+ if your powershell/.net is too old the script will fail