PR comments: handle unix on pwsh, update readme, rename variable in unix script

This commit is contained in:
Sander Declerck 2025-12-10 13:48:07 +01:00
parent 1b5814ecc2
commit dace5f3845
No known key found for this signature in database
3 changed files with 29 additions and 14 deletions

View file

@ -116,17 +116,21 @@ More information about the shell integration can be found in the [shell integrat
## Uninstallation ## Uninstallation
To uninstall the Aikido Safe Chain, you can run the following command: To uninstall the Aikido Safe Chain, use our one-line uninstaller:
1. **Remove all aliases from your shell** by running: ### Unix/Linux/macOS
```shell
safe-chain teardown ```shell
``` curl -fsSL https://raw.githubusercontent.com/AikidoSec/safe-chain/main/install-scripts/uninstall-safe-chain.sh | sh
2. **Uninstall the Aikido Safe Chain package** using npm: ```
```shell
npm uninstall -g @aikidosec/safe-chain ### Windows (PowerShell)
```
3. **❗Restart your terminal** to remove the aliases. ```powershell
iex (iwr "https://raw.githubusercontent.com/AikidoSec/safe-chain/main/install-scripts/uninstall-safe-chain.ps1" -UseBasicParsing)
```
**❗Restart your terminal** after uninstalling to ensure all aliases are removed.
# Configuration # Configuration

View file

@ -75,11 +75,22 @@ function Uninstall-SafeChain {
Write-Info "Uninstalling safe-chain..." Write-Info "Uninstalling safe-chain..."
# Run teardown if safe-chain is available # Run teardown if safe-chain is available
# Check for both safe-chain.exe (Windows) and safe-chain (Unix) since PowerShell Core runs on all platforms
$safeChainExe = Join-Path $InstallDir "safe-chain.exe" $safeChainExe = Join-Path $InstallDir "safe-chain.exe"
$safeChainBin = Join-Path $InstallDir "safe-chain"
$safeChainPath = $null
if (Test-Path $safeChainExe) { if (Test-Path $safeChainExe) {
$safeChainPath = $safeChainExe
}
elseif (Test-Path $safeChainBin) {
$safeChainPath = $safeChainBin
}
if ($safeChainPath) {
Write-Info "Running safe-chain teardown..." Write-Info "Running safe-chain teardown..."
try { try {
& $safeChainExe teardown & $safeChainPath teardown
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
Write-Warn "safe-chain teardown encountered issues, continuing with uninstallation..." Write-Warn "safe-chain teardown encountered issues, continuing with uninstallation..."
} }

View file

@ -77,11 +77,11 @@ remove_volta_installation() {
# Main uninstallation # Main uninstallation
main() { main() {
SAFE_CHAIN_EXE="$INSTALL_DIR/safe-chain" SAFE_CHAIN_LOCATION="$INSTALL_DIR/safe-chain"
if [ -x "$SAFE_CHAIN_EXE" ]; then if [ -x "$SAFE_CHAIN_LOCATION" ]; then
info "Running safe-chain teardown..." info "Running safe-chain teardown..."
"$SAFE_CHAIN_EXE" teardown || warn "safe-chain teardown encountered issues, continuing with uninstallation..." "$SAFE_CHAIN_LOCATION" teardown || warn "safe-chain teardown encountered issues, continuing with uninstallation..."
elif command_exists safe-chain; then elif command_exists safe-chain; then
info "Running safe-chain teardown..." info "Running safe-chain teardown..."
safe-chain teardown || warn "safe-chain teardown encountered issues, continuing with uninstallation..." safe-chain teardown || warn "safe-chain teardown encountered issues, continuing with uninstallation..."