From 1836edba8857373f56a4332dab81a7030a47fe76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8C=C3=A1bera?= Date: Sat, 22 Jun 2019 21:42:05 +0200 Subject: [PATCH] fix(checkhashes): Do not call scoop directly (#3527) * fix(checkhashes): Do not call scoop directly https://github.com/Ash258/GithubActionsBucketForTesting/runs/153802813 * Also fix build --- README.md | 22 +++++++++++----------- bin/checkhashes.ps1 | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 60f063d032..7bdc53a2fd 100644 --- a/README.md +++ b/README.md @@ -132,17 +132,17 @@ If you find Scoop useful and would like to support ongoing development and maint The following buckets are known to scoop: -* [main](https://github.com/ScoopInstaller/Main) - Default bucket for the most common (mostly CLI) apps -* [extras](https://github.com/lukesampson/scoop-extras) - Apps that don't fit the main bucket's [criteria](https://github.com/lukesampson/scoop/wiki/Criteria-for-including-apps-in-the-main-bucket) -* [games](https://github.com/Calinou/scoop-games) - Open source/freeware games and game-related tools -* [nerd-fonts](https://github.com/matthewjberger/scoop-nerd-fonts) - Nerd Fonts -* [nirsoft](https://github.com/kodybrown/scoop-nirsoft) - A subset of the [250](https://github.com/rasa/scoop-directory/blob/master/by-score.md#MCOfficer_scoop-nirsoft) [Nirsoft](https://nirsoft.net) apps -* [java](https://github.com/ScoopInstaller/Java) - Installers for Oracle Java, OpenJDK, Zulu, ojdkbuild, AdoptOpenJDK, Amazon Corretto, BellSoft Liberica & SapMachine -* [jetbrains](https://github.com/Ash258/Scoop-JetBrains) - Installers for all JetBrains utilities and IDEs +- [main](https://github.com/ScoopInstaller/Main) - Default bucket for the most common (mostly CLI) apps +- [extras](https://github.com/lukesampson/scoop-extras) - Apps that don't fit the main bucket's [criteria](https://github.com/lukesampson/scoop/wiki/Criteria-for-including-apps-in-the-main-bucket) +- [games](https://github.com/Calinou/scoop-games) - Open source/freeware games and game-related tools +- [nerd-fonts](https://github.com/matthewjberger/scoop-nerd-fonts) - Nerd Fonts +- [nirsoft](https://github.com/kodybrown/scoop-nirsoft) - A subset of the [250](https://github.com/rasa/scoop-directory/blob/master/by-score.md#MCOfficer_scoop-nirsoft) [Nirsoft](https://nirsoft.net) apps +- [java](https://github.com/ScoopInstaller/Java) - Installers for Oracle Java, OpenJDK, Zulu, ojdkbuild, AdoptOpenJDK, Amazon Corretto, BellSoft Liberica & SapMachine +- [jetbrains](https://github.com/Ash258/Scoop-JetBrains) - Installers for all JetBrains utilities and IDEs -* [nonportable](https://github.com/oltolm/scoop-nonportable) - Non-portable apps (may require UAC) -* [php](https://github.com/ScoopInstaller/PHP) - Installers for most versions of PHP -* [versions](https://github.com/ScoopInstaller/Versions) - Alternative versions of apps found in other buckets +- [nonportable](https://github.com/oltolm/scoop-nonportable) - Non-portable apps (may require UAC) +- [php](https://github.com/ScoopInstaller/PHP) - Installers for most versions of PHP +- [versions](https://github.com/ScoopInstaller/Versions) - Alternative versions of apps found in other buckets The main bucket is installed by default. To add any of the other buckets, type: ``` @@ -155,4 +155,4 @@ For example, to add the extras bucket, type: ## Other application buckets -Many other application buckets hosted on Github can be found in the [Scoop Directory](https://github.com/rasa/scoop-directory). +Many other application buckets hosted on Github can be found in the [Scoop Directory](https://github.com/rasa/scoop-directory). diff --git a/bin/checkhashes.ps1 b/bin/checkhashes.ps1 index 5233a96dd6..2588b126d9 100644 --- a/bin/checkhashes.ps1 +++ b/bin/checkhashes.ps1 @@ -52,7 +52,7 @@ param( $Dir = Resolve-Path $Dir if ($ForceUpdate) { $Update = $true } # Cleanup -if (!$UseCache) { scoop cache rm '*HASH_CHECK*' } +if (!$UseCache) { Remove-Item "$cachedir\*HASH_CHECK*" -Force } function err ([String] $name, [String[]] $message) { Write-Host "$name`: " -ForegroundColor Red -NoNewline