From fa77c74fc9f3dd71a46fea2890e68ea538a0fe67 Mon Sep 17 00:00:00 2001 From: madumlao Date: Fri, 5 Nov 2021 19:43:42 +0800 Subject: [PATCH] Do not change shell is zsh was not installed --- install.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index a904a6b..dd71c62 100755 --- a/install.sh +++ b/install.sh @@ -23,15 +23,19 @@ fi echo "Changing default shell" ZSH_PATH="$(which zsh)" -if sudo -l chsh -s $ZSH_PATH $USER; then - sudo chsh -s $ZSH_PATH $USER -elif sudo -l usermod -s $ZSH_PATH $USER; then - sudo usermod -s $ZSH_PATH $USER -else - echo "Cannot change shell using sudo, trying password" - if ! chsh -s "$ZSH_PATH"; then - echo "Unable to change shell to $ZSH_PATH, please change shell manually" +if [ -x "$ZSH_PATH" ]; then + if sudo -l chsh -s $ZSH_PATH $USER; then + sudo chsh -s $ZSH_PATH $USER + elif sudo -l usermod -s $ZSH_PATH $USER; then + sudo usermod -s $ZSH_PATH $USER + else + echo "Cannot change shell using sudo, trying password" + if ! chsh -s "$ZSH_PATH"; then + echo "Unable to change shell to $ZSH_PATH, please change shell manually" + fi fi +else + echo "No zsh available" fi SKEL_DIR="$APP_DIR/skel"