adjusted zsh.sh so it will work even on a non-posix compliant shell like fish

This commit is contained in:
JaKooLit 2025-03-24 17:11:52 +09:00
parent 79b63dde32
commit 9024eefdcf

View File

@ -76,18 +76,20 @@ if command -v zsh >/dev/null; then
cp -r 'assets/.zprofile' ~/ cp -r 'assets/.zprofile' ~/
# Check if the current shell is zsh # Check if the current shell is zsh
if [[ "$SHELL" != *"zsh"* ]]; then current_shell=$(basename "$SHELL")
if [ "$current_shell" != "zsh" ]; then
printf "${NOTE} Changing default shell to ${MAGENTA}zsh${RESET}..." printf "${NOTE} Changing default shell to ${MAGENTA}zsh${RESET}..."
printf "\n%.0s" {1..2} printf "\n%.0s" {1..2}
while ! chsh -s $(which zsh); do # Loop to ensure the chsh command succeeds
while ! chsh -s "$(command -v zsh)"; do
echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG" echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG"
sleep 1 sleep 1
done done
printf "${INFO} Shell changed successfully to ${MAGENTA}zsh${RESET}" 2>&1 | tee -a "$LOG" printf "${INFO} Shell changed successfully to ${MAGENTA}zsh${RESET}" 2>&1 | tee -a "$LOG"
else else
echo "${NOTE}Your shell is already set to ${MAGENTA}zsh${RESET}." echo "${NOTE} Your shell is already set to ${MAGENTA}zsh${RESET}."
fi fi
fi fi