holm/ohmyzsh
1
1
Fork 0
forked from extern/ohmyzsh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(installer): correct check for sudo in shell change logic

Browse Source
This commit is contained in:
Marc Cornellà 2022-01-24 15:45:42 +01:00
parent 861805b64d
commit 788802af68
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/install.sh
View File

@ -60,6 +60,8 @@ command_exists() {
} }
user_can_sudo() { user_can_sudo() {
# Check if sudo is installed
command_exists sudo || return 1
# The following command has 3 parts: # The following command has 3 parts:
# #
# 1. Run `sudo` with `-v`. Does the following: # 1. Run `sudo` with `-v`. Does the following:
@ -78,7 +80,7 @@ user_can_sudo() {
# to run `sudo` in the default locale (with `LANG=`) so that the message # to run `sudo` in the default locale (with `LANG=`) so that the message
# stays consistent regardless of the user's locale. # stays consistent regardless of the user's locale.
# #
LANG= sudo -n -v 2>&1 | grep -q "may not run sudo" ! LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
} }
# The [ -t 1 ] check only works when the function is not called from # The [ -t 1 ] check only works when the function is not called from
@ -395,9 +397,9 @@ EOF
# be prompted for the password either way, so this shouldn't cause any issues. # be prompted for the password either way, so this shouldn't cause any issues.
# #
if user_can_sudo; then if user_can_sudo; then
chsh -s "$zsh" "$USER" # run chsh normally
else
sudo -k chsh -s "$zsh" "$USER" # -k forces the password prompt sudo -k chsh -s "$zsh" "$USER" # -k forces the password prompt
else
chsh -s "$zsh" "$USER" # run chsh normally
fi fi
# Check if the shell change was successful # Check if the shell change was successful