From 7ec405792b3215e026a15639309b8549f5e52bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <raphael@offensive-security.com>
Date: Thu, 29 Oct 2020 14:45:50 +0100
Subject: [PATCH] Enable zsh by default

---
 .../usr/lib/live/config/0031-kali-password    |  4 --
 .../usr/lib/live/config/0031-kali-user-setup  | 19 ++++++++++
 simple-cdd/profiles/kali.postinst             | 38 +++++++++++++++----
 3 files changed, 50 insertions(+), 11 deletions(-)
 delete mode 100755 kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-password
 create mode 100755 kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup

diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-password b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-password
deleted file mode 100755
index f353a10..0000000
--- a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-password
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Set "kali" as password for the user kali
-usermod -p 'AqLUsDitNnTsw' kali
diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
new file mode 100755
index 0000000..04f19a7
--- /dev/null
+++ b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+configure_zsh() {
+    # Stop if zsh is not present
+    if [ ! -x /usr/bin/zsh ]; then
+	return
+    fi
+    # Stop if user has opted out of zsh
+    if echo "${LIVE_CONFIG_CMDLINE}" | grep -qs 'nozsh'; then
+	return
+    fi
+    chsh --shell /usr/bin/zsh kali
+}
+
+# Set "kali" as password for the user kali
+usermod -p 'AqLUsDitNnTsw' kali
+
+# Change default shell to zsh
+configure_zsh
diff --git a/simple-cdd/profiles/kali.postinst b/simple-cdd/profiles/kali.postinst
index 51e7a66..6be8adc 100755
--- a/simple-cdd/profiles/kali.postinst
+++ b/simple-cdd/profiles/kali.postinst
@@ -1,17 +1,41 @@
 #!/bin/sh
 
-if grep -q '^deb ' /etc/apt/sources.list; then
-    echo "INFO: sources.list is configured, everything is fine"
-    exit 0
-fi
+configure_sources_list() {
+    if grep -q '^deb ' /etc/apt/sources.list; then
+	echo "INFO: sources.list is configured, everything is fine"
+	return
+    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 <<END
+    cat >/etc/apt/sources.list <<END
 # See https://www.kali.org/docs/general-use/kali-linux-sources-list-repositories/
 deb http://http.kali.org/kali kali-rolling main contrib non-free
 
 # Additional line for source packages
 # deb-src http://http.kali.org/kali kali-rolling main contrib non-free
 END
-apt-get update
+    apt-get update
+}
+
+configure_zsh() {
+    if grep -q 'nozsh' /proc/cmdline; then
+	echo "INFO: user opted out of zsh by default"
+	return
+    fi
+    if [ ! -x /usr/bin/zsh ]; then
+	echo "INFO: /usr/bin/zsh is not available"
+	return
+    fi
+    for user in $(cd /home && ls); do
+	if ! getent passwd $user >/dev/null; then
+	    echo "WARNING: user '$user' is invalid but /home/$user exists"
+	    continue
+	fi
+	echo "INFO: changing default shell of user '$user' to zsh"
+	chsh --shell /usr/bin/zsh $user
+    done
+}
+
+configure_sources_list
+configure_zsh