diff --git a/.justfiles/build.just b/.justfiles/build.just index f4dcaed..6116e8b 100644 --- a/.justfiles/build.just +++ b/.justfiles/build.just @@ -26,7 +26,7 @@ install: fi echo "installed ${dest}/cans" -# Remove go-installed / brew / ./bin cans, plus leftover uv venv. +# Remove every cans install: go/brew bins, ./bin, and ~/.cans. uninstall: #!/usr/bin/env bash set -euo pipefail @@ -44,20 +44,10 @@ uninstall: brew uninstall --formula --force cans fi home="${CANS_HOME:-$HOME/.cans}" - if [ -d "${home}/venv" ]; then - rm -rf "${home}/venv" - echo "removed ${home}/venv" + if [ -e "$home" ]; then + rm -rf "$home" + echo "removed ${home}" fi - echo "keep/shipped still in ${home} — just uninstall-home" -# Remove ~/.cans (keep, shipped, native, venv). uninstall-home: - #!/usr/bin/env bash - set -euo pipefail - home="${CANS_HOME:-$HOME/.cans}" - if [ ! -e "$home" ]; then - echo "no ${home}" - exit 0 - fi - rm -rf "$home" - echo "removed ${home}" + just uninstall diff --git a/README.md b/README.md index 1caa43b..ba65a34 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ cd cans just install ``` -`just install` (same as `just run install`) is `go install` into `$(go env GOBIN)`, or `$(go env GOPATH)/bin` if GOBIN is empty. `cans doctor` fetches the mouth. `just uninstall` removes the binary and leftover `~/.cans/venv`. `just uninstall-home` removes `~/.cans`. +`just install` (same as `just run install`) is `go install` into `$(go env GOBIN)`, or `$(go env GOPATH)/bin` if GOBIN is empty. `cans doctor` fetches the mouth. `just uninstall` removes the binary, brew formula, and `~/.cans`. diff --git a/justfile b/justfile index c66cb8c..54f6068 100644 --- a/justfile +++ b/justfile @@ -30,13 +30,13 @@ mod dist '.justfiles/dist.just' install: just build install -[doc('remove installed cans binaries and leftover uv venv')] +[doc('remove cans binaries, brew formula, and ~/.cans')] uninstall: just build uninstall -[doc('remove ~/.cans state')] +[doc('same as uninstall')] uninstall-home: - just build uninstall-home + just uninstall [private] default: