From eb2060ab465a2dd49f74c3ab90cd1f35006ba28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 7 Mar 2021 16:06:34 +0100 Subject: [PATCH] Move changing to BASH to armbian-config (#2694) This prevents unwanted automated switching back to bash on upgrade --- lib/compilation.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/compilation.sh b/lib/compilation.sh index ff1431897b..a35d1a07d6 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -596,18 +596,6 @@ compile_armbian-zsh() exit 0 END - # set up post remove script - cat <<-END > "${tmp_dir}/${armbian_zsh_dir}"/DEBIAN/postrm - #!/bin/sh - # change shell back to bash for future users - BASHLOCATION=\$(grep /bash\$ /etc/shells | tail -1) - sed -i "s|^SHELL=.*|SHELL=\${BASHLOCATION}|" /etc/default/useradd - sed -i "s|^DSHELL=.*|DSHELL=\${BASHLOCATION}|" /etc/adduser.conf - # change to BASH shell for root and all normal users - awk -F'[/:]' '{if (\$3 >= 1000 && \$3 != 65534 || \$3 == 0) print \$1}' /etc/passwd | xargs -L1 chsh -s \$(grep /bash\$ /etc/shells | tail -1) - exit 0 - END - cp -R "${SRC}"/cache/sources/oh-my-zsh "${tmp_dir}/${armbian_zsh_dir}"/etc/ cp -R "${SRC}"/cache/sources/evalcache "${tmp_dir}/${armbian_zsh_dir}"/etc/oh-my-zsh/plugins cp "${tmp_dir}/${armbian_zsh_dir}"/etc/oh-my-zsh/templates/zshrc.zsh-template "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc