From c50c0e15160a7fff17102e06ffd35025e16127c9 Mon Sep 17 00:00:00 2001 From: jgstew Date: Sun, 7 Jul 2024 09:36:43 -0700 Subject: [PATCH] add new path to find 7zip macos --- SharedProcessors/ExtractorSevenZip.py | 1 + SharedProcessors/ExtractorShutilUnpack.py | 1 + SharedProcessors/FileExeVersionExtractor.py | 1 + SharedProcessors/SevenZip.py | 1 + Test-Recipes/FileEncodingConvert.test.recipe.yaml | 1 + Test-Recipes/FileExeVersionExtractor-Win.test.recipe.yaml | 1 + Test-Recipes/FileGetExecutable.test.recipe.yaml | 1 + 7 files changed, 7 insertions(+) diff --git a/SharedProcessors/ExtractorSevenZip.py b/SharedProcessors/ExtractorSevenZip.py index 52382ce..47e0010 100644 --- a/SharedProcessors/ExtractorSevenZip.py +++ b/SharedProcessors/ExtractorSevenZip.py @@ -16,6 +16,7 @@ # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: diff --git a/SharedProcessors/ExtractorShutilUnpack.py b/SharedProcessors/ExtractorShutilUnpack.py index 4c05130..3bf6080 100644 --- a/SharedProcessors/ExtractorShutilUnpack.py +++ b/SharedProcessors/ExtractorShutilUnpack.py @@ -20,6 +20,7 @@ # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: diff --git a/SharedProcessors/FileExeVersionExtractor.py b/SharedProcessors/FileExeVersionExtractor.py index 83e5f15..e064045 100644 --- a/SharedProcessors/FileExeVersionExtractor.py +++ b/SharedProcessors/FileExeVersionExtractor.py @@ -23,6 +23,7 @@ # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: diff --git a/SharedProcessors/SevenZip.py b/SharedProcessors/SevenZip.py index f9afe3d..aa953d7 100644 --- a/SharedProcessors/SevenZip.py +++ b/SharedProcessors/SevenZip.py @@ -16,6 +16,7 @@ # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: diff --git a/Test-Recipes/FileEncodingConvert.test.recipe.yaml b/Test-Recipes/FileEncodingConvert.test.recipe.yaml index 2a242a6..289602d 100644 --- a/Test-Recipes/FileEncodingConvert.test.recipe.yaml +++ b/Test-Recipes/FileEncodingConvert.test.recipe.yaml @@ -28,6 +28,7 @@ Process: # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: diff --git a/Test-Recipes/FileExeVersionExtractor-Win.test.recipe.yaml b/Test-Recipes/FileExeVersionExtractor-Win.test.recipe.yaml index fbb42d6..551181d 100644 --- a/Test-Recipes/FileExeVersionExtractor-Win.test.recipe.yaml +++ b/Test-Recipes/FileExeVersionExtractor-Win.test.recipe.yaml @@ -18,6 +18,7 @@ Process: # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: diff --git a/Test-Recipes/FileGetExecutable.test.recipe.yaml b/Test-Recipes/FileGetExecutable.test.recipe.yaml index fc6332c..3380c8e 100644 --- a/Test-Recipes/FileGetExecutable.test.recipe.yaml +++ b/Test-Recipes/FileGetExecutable.test.recipe.yaml @@ -17,6 +17,7 @@ Process: # NONINTERACTIVE=1 brew install p7zip "/opt/homebrew/bin/7z", "/usr/local/bin/7z", + "/opt/homebrew/bin/7zz", # NONINTERACTIVE=1 brew install sevenzip "/usr/local/bin/7zz", # Ubuntu typical: