From 4286f054ec06696afb1b9f2930da33b699a8538c Mon Sep 17 00:00:00 2001 From: not a cow <104355555+not-a-cowfr@users.noreply.github.com> Date: Sat, 19 Jul 2025 20:10:14 -0700 Subject: [PATCH] Use cargo binstall in setup scripts (#340) * use cargo binstall if it exists * powershell --- packages/scripts/setup.ps1 | 3 +-- packages/scripts/setup.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/scripts/setup.ps1 b/packages/scripts/setup.ps1 index fcf91cc6..75503a94 100644 --- a/packages/scripts/setup.ps1 +++ b/packages/scripts/setup.ps1 @@ -198,8 +198,7 @@ https://learn.microsoft.com/windows/package-manager/winget/ Write-Host Write-Host 'Installing Rust tools...' -ForegroundColor Yellow - cargo install cargo-watch - cargo install sqlx-cli + if (Get-Command cargo-binstall -ea 0) { cargo binstall cargo-watch sqlx-cli } else { cargo install cargo-watch sqlx-cli } if ($LASTEXITCODE -ne 0) { Exit-WithError 'Failed to install Rust tools' } diff --git a/packages/scripts/setup.sh b/packages/scripts/setup.sh index 8c35af75..5ef07cda 100755 --- a/packages/scripts/setup.sh +++ b/packages/scripts/setup.sh @@ -184,7 +184,7 @@ esac if [ "${CI:-}" != "true" ]; then echo "installing rust tools..." _tools="cargo-watch sqlx-cli" - echo "$_tools" | xargs cargo install + echo "$_tools" | xargs cargo $(has cargo-binstall && echo binstall || echo install) fi echo 'your machine has been setup for onelauncher development!'