mirror of
https://github.com/AikidoSec/safe-chain.git
synced 2026-05-26 20:20:49 +00:00
Improve volta installation check
This commit is contained in:
parent
b60cb63fdb
commit
2d87e1b817
2 changed files with 4 additions and 3 deletions
|
|
@ -86,7 +86,7 @@ function Remove-VoltaInstallation {
|
||||||
|
|
||||||
# Volta manages global packages in its own directory
|
# Volta manages global packages in its own directory
|
||||||
# Check if safe-chain is installed via Volta
|
# Check if safe-chain is installed via Volta
|
||||||
volta list @aikidosec/safe-chain 2>&1 | Out-Null
|
volta list safe-chain 2>&1 | Out-Null
|
||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
Write-Info "Detected Volta installation of @aikidosec/safe-chain"
|
Write-Info "Detected Volta installation of @aikidosec/safe-chain"
|
||||||
Write-Info "Uninstalling Volta version before installing binary version..."
|
Write-Info "Uninstalling Volta version before installing binary version..."
|
||||||
|
|
@ -170,7 +170,8 @@ function Install-SafeChain {
|
||||||
|
|
||||||
if ($setupArgs) {
|
if ($setupArgs) {
|
||||||
& $finalFile $setupCmd $setupArgs
|
& $finalFile $setupCmd $setupArgs
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
& $finalFile $setupCmd
|
& $finalFile $setupCmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ check_volta_installation() {
|
||||||
|
|
||||||
# Volta manages global packages in its own directory
|
# Volta manages global packages in its own directory
|
||||||
# Check if safe-chain is installed via Volta
|
# Check if safe-chain is installed via Volta
|
||||||
if volta list @aikidosec/safe-chain >/dev/null 2>&1; then
|
if volta list safe-chain >/dev/null 2>&1; then
|
||||||
info "Detected Volta installation of @aikidosec/safe-chain"
|
info "Detected Volta installation of @aikidosec/safe-chain"
|
||||||
info "Uninstalling Volta version before installing binary version..."
|
info "Uninstalling Volta version before installing binary version..."
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue