From 834f065072556c31b9dba8948e2dc29936f0f112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Tue, 18 May 2021 16:01:33 +0200 Subject: [PATCH] Revert "Swap spaces for tabs to match other files" This reverts commit c6b70bf35555dce4d1992145feaa090816c59d70. --- .../includes.installer/kali-finish-install | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install index 0ef2f3d..dba61d8 100755 --- a/kali-config/common/includes.installer/kali-finish-install +++ b/kali-config/common/includes.installer/kali-finish-install @@ -8,65 +8,65 @@ # and in the live-build configuration). configure_sources_list() { - if grep -q '^deb ' /etc/apt/sources.list; then + if grep -q '^deb ' /etc/apt/sources.list; then echo "INFO: sources.list is configured, everything is fine" return - fi + fi - echo "INFO: sources.list is empty, setting up a default one for Kali" + echo "INFO: sources.list is empty, setting up a default one for Kali" - cat >/etc/apt/sources.list </etc/apt/sources.list </dev/null; then - echo "WARNING: user '$user' is invalid but /home/$user exists" - continue + echo "WARNING: user '$user' is invalid but /home/$user exists" + continue fi echo "$user" - done - echo "root" + done + echo "root" } configure_zsh() { - if grep -q 'nozsh' /proc/cmdline; then + if grep -q 'nozsh' /proc/cmdline; then echo "INFO: user opted out of zsh by default" return - fi - if [ ! -x /usr/bin/zsh ]; then + fi + if [ ! -x /usr/bin/zsh ]; then echo "INFO: /usr/bin/zsh is not available" return - fi - for user in $(get_user_list); do + fi + for user in $(get_user_list); do echo "INFO: changing default shell of user '$user' to zsh" chsh --shell /usr/bin/zsh $user - done + done } # This is generically named in case we want to add other groups in the future. configure_usergroups() { - # Create the kaboxer group if needed - addgroup --system kaboxer || true - # Create the wireshark group if needed - addgroup --system wireshark || true + # Create the kaboxer group if needed + addgroup --system kaboxer || true + # Create the wireshark group if needed + addgroup --system wireshark || true - # kaboxer - for kaboxer - # dialout - for serial access - # wireshark - capture sessions in wireshark - kali_groups="kaboxer,dialout,wireshark" + # kaboxer - for kaboxer + # dialout - for serial access + # wireshark - capture sessions in wireshark + kali_groups="kaboxer,dialout,wireshark" - for user in $(get_user_list); do - echo "INFO: adding user '$user' to groups '$kali_groups'" - usermod -a -G "$kali_groups" $user || true - done + for user in $(get_user_list); do + echo "INFO: adding user '$user' to groups '$kali_groups'" + usermod -a -G "$kali_groups" $user || true + done } configure_sources_list