Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run as a standard user #315

Merged
merged 10 commits into from
Jun 3, 2020
Merged

Run as a standard user #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
921a117
Run the script as a standard user
lakshaykaushik Jun 2, 2020
41bfa46
Update install.sh
lakshaykaushik Jun 2, 2020
f2cd270
Update install.sh
lakshaykaushik Jun 2, 2020
bcac5ff
Update Abort message
lakshaykaushik Jun 2, 2020
fa884ca
Updated abort message
lakshaykaushik Jun 2, 2020
c966cec
Refactored sudo access for Mac and Linux
lakshaykaushik Jun 3, 2020
9206d7e
Changed to
lakshaykaushik Jun 3, 2020
b0eedd8
removed if statement
lakshaykaushik Jun 3, 2020
d734ace
new line
lakshaykaushik Jun 3, 2020
fd1b157
Update install.sh
lakshaykaushik Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ have_sudo_access() {
fi

if [[ -z "${HOMEBREW_ON_LINUX-}" ]] && [[ "$HAVE_SUDO_ACCESS" -ne 0 ]]; then
abort "Need sudo access on macOS!"
abort "Need sudo access on macOS (e.g. the user $USER to be an Administrator)!"
fi

return "$HAVE_SUDO_ACCESS"
Expand Down Expand Up @@ -233,14 +233,14 @@ EOABORT
)"
fi

if [[ -n "${HOMEBREW_ON_LINUX-}" ]]; then
if [[ -z "${HOMEBREW_ON_LINUX-}" ]]; then
have_sudo_access
else
if [[ -n "${CI-}" ]] || [[ -w "$HOMEBREW_PREFIX_DEFAULT" ]] || [[ -w "/home/linuxbrew" ]] || [[ -w "/home" ]]; then
HOMEBREW_PREFIX="$HOMEBREW_PREFIX_DEFAULT"
else
trap exit SIGINT
sudo_output="$(/usr/bin/sudo -n -l mkdir 2>&1)"
sudo_exit_code="$?"
if [[ "$sudo_exit_code" -ne 0 ]] && [[ "$sudo_output" = "sudo: a password is required" ]]; then
if [[ $(/usr/bin/sudo -n -l mkdir 2>&1) != *"mkdir"* ]]; then
ohai "Select the Homebrew installation directory"
echo "- ${tty_bold}Enter your password${tty_reset} to install to ${tty_underline}${HOMEBREW_PREFIX_DEFAULT}${tty_reset} (${tty_bold}recommended${tty_reset})"
echo "- ${tty_bold}Press Control-D${tty_reset} to install to ${tty_underline}$HOME/.linuxbrew${tty_reset}"
Expand Down Expand Up @@ -277,8 +277,6 @@ EOABORT
)"
elif version_lt "$macos_version" "10.9"; then
abort "Your OS X version is too old"
elif ! [[ "$(dsmemberutil checkmembership -U "$USER" -G "$GROUP")" = *"user is a member"* ]]; then
abort "This script requires the user $USER to be an Administrator."
elif version_gt "$macos_version" "$MACOS_LATEST_SUPPORTED" || \
version_lt "$macos_version" "$MACOS_OLDEST_SUPPORTED"; then
who="We"
Expand Down
2 changes: 1 addition & 1 deletion uninstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ have_sudo_access() {
fi

if [[ -z "${HOMEBREW_ON_LINUX-}" ]] && [[ "$HAVE_SUDO_ACCESS" -ne 0 ]]; then
abort "Need sudo access on macOS!"
abort "Need sudo access on macOS (e.g. the user $USER to be an Administrator)!"
fi

return "$HAVE_SUDO_ACCESS"
Expand Down