mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve working directory error messages

Browse Source 
- Check for directory existing and directory being readable separately
  and print appropriate messages for each
- Make error messages more consistent
This commit is contained in:
Mike McQuaid 2024-01-10 17:21:57 +00:00
parent 11e4b66dcf
commit abc1d14807
No known key found for this signature in database
GPG Key ID: 3338A31AFDB1D829
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/brew.sh
View File

@ -419,9 +419,13 @@ fi
# Many Pathname operations use getwd when they shouldn't, and then throw # Many Pathname operations use getwd when they shouldn't, and then throw
# odd exceptions. Reduce our support burden by showing a user-friendly error. # odd exceptions. Reduce our support burden by showing a user-friendly error.
if [[ ! -d "$(pwd)" ]] if ! [[ -d "$(pwd)" ]]
then then
odie "The current working directory doesn't exist, cannot proceed." odie "The current working directory must exist to run brew."
fi
if ! [[ -r "$(pwd)" ]]
then
odie "The current working directory must be readable to run brew."
fi fi
##### #####

14
bin/brew
View File

@ -12,10 +12,20 @@ fi
set +o posix # as we are using bash now set +o posix # as we are using bash now
# Fail fast with concise message when cwd does not exist # Fail fast with concise messages when PWD has issues
if [[ -z "${PWD-}" ]]
then
echo "Error: \$PWD must be set to run brew." >&2
exit 1
fi
if ! [[ -d "${PWD}" ]] if ! [[ -d "${PWD}" ]]
then then
echo "Error: The current working directory doesn't exist, cannot proceed." >&2 echo "Error: The current working directory must exist to run brew." >&2
exit 1
fi
if ! [[ -r "${PWD}" ]]
then
echo "Error: The current working directory must be readable to run brew." >&2
exit 1 exit 1
fi fi