Skip to content

Commit 9a01f1f

Browse files
authored
Merge pull request #960 from gromgit/linux-rmdir-parent-dir
linux: cleanup default Homebrew parent dir
2 parents 9e45b0a + 643e8c1 commit 9a01f1f

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

uninstall.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,13 @@ done
248248
# Attempt to locate Homebrew unless `--path` is passed
249249
if [[ "${#homebrew_prefix_candidates[@]}" -eq 0 ]]
250250
then
251-
prefix="$("${homebrew_prefix_default}"/bin/brew --prefix)"
252-
[[ -n "${prefix}" ]] && homebrew_prefix_candidates+=("${prefix}")
253-
prefix="$(command -v "${homebrew_prefix_default}"/bin/brew)" || prefix=""
254-
[[ -n "${prefix}" ]] && homebrew_prefix_candidates+=("$(dirname "$(dirname "$(strip_s "${prefix}")")")")
251+
if [[ -x "${homebrew_prefix_default}"/bin/brew ]]
252+
then
253+
prefix="$("${homebrew_prefix_default}"/bin/brew --prefix)"
254+
[[ -n "${prefix}" ]] && homebrew_prefix_candidates+=("${prefix}")
255+
prefix="$(command -v "${homebrew_prefix_default}"/bin/brew)" || prefix=""
256+
[[ -n "${prefix}" ]] && homebrew_prefix_candidates+=("$(dirname "$(dirname "$(strip_s "${prefix}")")")")
257+
fi
255258
homebrew_prefix_candidates+=("${homebrew_prefix_default}") # Homebrew default path
256259
homebrew_prefix_candidates+=("${HOME}/.linuxbrew") # Linuxbrew default path
257260
[[ "$(uname -m)" == "arm64" ]] && homebrew_prefix_candidates+=("/usr/local") # If migrated from Intel to ARM old path will remain
@@ -443,6 +446,10 @@ if [[ "${HOMEBREW_PREFIX}" != "${homebrew_prefix_default}" && -e "${HOMEBREW_PRE
443446
then
444447
execute_sudo rmdir "${HOMEBREW_PREFIX}"
445448
fi
449+
if [[ "${ostype}" == "linux" && "${HOMEBREW_PREFIX}" == "${homebrew_prefix_default}" && ! -e "${HOMEBREW_PREFIX}" ]]
450+
then
451+
execute_sudo rmdir "$(dirname "${HOMEBREW_PREFIX}")"
452+
fi
446453
if [[ "${HOMEBREW_PREFIX}" != "${HOMEBREW_REPOSITORY}" && -e "${HOMEBREW_REPOSITORY}" ]]
447454
then
448455
execute_sudo rmdir "${HOMEBREW_REPOSITORY}"

0 commit comments

Comments
 (0)