fix(scoop-checkup): Don't throw 7zip error when external 7zip is used (…

…#5703) * fix(scoop-checkup): Don't throw 7zip error when external 7zip is used * Update CHANGELOG.md
ScoopInstaller · Oct 26, 2023 · fb31696 · Aldo-f · Nov 5, 2023 · fb31696
1 parent 7e81e49
commit fb31696
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - **shim:** Avoid unexpected output of `list` subcommand ([#5681](https://github.com/ScoopInstaller/Scoop/issues/5681))
 - **scoop-reset:** Don't abort when multiple apps are passed and an app is running ([#5687](https://github.com/ScoopInstaller/Scoop/issues/5687))
 - **core:** Do not call `scoop` externally from inside the code ([#5695](https://github.com/ScoopInstaller/Scoop/issues/5695))
+- **scoop-checkup:** Don't throw 7zip error when external 7zip is used ([#5703](https://github.com/ScoopInstaller/Scoop/issues/5703))
 
 ### Performance Improvements
 

diff --git a/libexec/scoop-checkup.ps1 b/libexec/scoop-checkup.ps1
@@ -19,7 +19,7 @@ $issues += !(check_main_bucket)
 $issues += !(check_long_paths)
 $issues += !(Get-WindowsDeveloperModeStatus)
 
-if (!(Test-HelperInstalled -Helper 7zip)) {
+if (!(Test-HelperInstalled -Helper 7zip) -and !(get_config USE_EXTERNAL_7ZIP)) {
 if ((get_config USE_EXTERNAL_7ZIP)) { 
     try { 
         $7zPath = (Get-Command '7z' -CommandType Application -ErrorAction Stop | Select-Object -First 1).Source 
     } catch [System.Management.Automation.CommandNotFoundException] { 
         abort "`nCannot find external 7-Zip (7z.exe) while 'use_external_7zip' is 'true'!`nRun 'scoop config use_external_7zip false' or install 7-Zip manually and try again." 
     } 
 } else { 
     $7zPath = Get-HelperPath -Helper 7zip 
 } 
 if ((get_config USE_EXTERNAL_7ZIP)) { 
     try { 
         $7zPath = (Get-Command '7z' -CommandType Application -ErrorAction Stop | Select-Object -First 1).Source 
     } catch [System.Management.Automation.CommandNotFoundException] { 
         abort "`nCannot find external 7-Zip (7z.exe) while 'use_external_7zip' is 'true'!`nRun 'scoop config use_external_7zip false' or install 7-Zip manually and try again." 
     } 
 } else { 
     $7zPath = Get-HelperPath -Helper 7zip 
 } 
     warn "'7-Zip' is not installed! It's required for unpacking most programs. Please Run 'scoop install 7zip' or 'scoop install 7zip-zstd'."
     $issues++
 }