From 9d2b3ce79f9f7eaf989eb4606c36f84ee8eb1cfb Mon Sep 17 00:00:00 2001 From: Fran Date: Fri, 24 May 2019 16:42:26 +0200 Subject: [PATCH] installer: fix for Solus OS and systems with no /etc/shells Co-authored-by: Fredrik Fornwall --- tools/install.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index 4dc25b0e0..8ec973832 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -106,7 +106,18 @@ setup_shell() { fi echo "${BLUE}Time to change your default shell to zsh!${NORMAL}" - if ! chsh -s $(grep '^/.*/zsh$' /etc/shells | tail -1); then + + # Test for the right location of the "shells" file + if [ -f /etc/shells ]; then + shells_file=/etc/shells + elif [ -f /usr/share/defaults/etc/shells ]; then # Solus OS + shells_file=/usr/share/defaults/etc/shells + else + error "could not find /etc/shells file. Change your default shell manually." + return + fi + + if ! chsh -s $(grep '^/.*/zsh$' "$shells_file" | tail -1); then error "chsh command unsuccessful. Change your default shell manually." fi }