From 19766ceac4fd8d744904f420a0fe9f837261335b Mon Sep 17 00:00:00 2001
From: Augusto Gunsch <augustogunsch@tutanota.com>
Date: Thu, 12 Aug 2021 12:02:11 -0300
Subject: [PATCH] Fix some issues

---
 install.sh      | 17 ++++++++++++-----
 post-install.sh |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index 1afa0d2..5d5a998 100755
--- a/install.sh
+++ b/install.sh
@@ -72,7 +72,7 @@ readonly INIT_SYS
 readonly UEFI
 
 right_chroot() {
-	[ "$DISTRO" = "arch" ] && arch-chroot $@ || chroot $@
+	[ "$DISTRO" = "arch" ] && arch-chroot $@ || artix-chroot $@
 }
 
 right_fstabgen() {
@@ -201,7 +201,7 @@ install_base() {
 }
 
 set_timezone() {
-	ln -sf "/mnt/usr/share/zoneinfo/$TIMEZONE" /mnt/etc/localtime
+	ln -sf "/usr/share/zoneinfo/$TIMEZONE" /mnt/etc/localtime
 	quiet right_chroot /mnt hwclock --systohc
 }
 
@@ -229,7 +229,14 @@ setup_grub() {
 
 setup_users() {
 	echo -n "Configuring users..."
-	right_chroot /mnt useradd -m "$PERSONAL_USER"
+
+	set +e
+	# There might be a group with the user's name
+	awk -F: '$1 ~ /^'$PERSONAL_USER'$/ { exit 1 }' /etc/group
+	[ $? -eq 0 ] && right_chroot /mnt useradd --badnames -m "$PERSONAL_USER" || \
+		right_chroot /mnt useradd --badnames -m -g "$PERSONAL_USER" "$PERSONAL_USER"
+	set -e
+
 	echo -e "root:$ROOT_PASSWORD\n$PERSONAL_USER:$PERSONAL_PASSWORD" | chpasswd -R /mnt
 	echo "done"
 }
@@ -241,11 +248,11 @@ setup_network() {
 	echo "::1	localhost" >> /mnt/etc/hosts
 	echo "127.0.1.1	$MACHINE_HOSTNAME.localdomain	$MACHINE_HOSTNAME" >> /mnt/etc/hosts
 
-	quiet right_chroot /mnt pacman -S dhcpcd wpa_supplicant
+	quiet right_basestrap /mnt dhcpcd wpa_supplicant
 	if [ "$DISTRO" = "artix" ]; then
 		if [ "$INIT_SYS" = "openrc-init" ]; then
 			echo "hostname=\"$MACHINE_HOSTNAME\"" > /mnt/etc/conf.d/hostname
-			quiet right_chroot /mnt pacman -S connman-openrc
+			quiet right_basestrap /mnt connman-openrc
 			quiet right_chroot /mnt rc-update add connmand
 		fi
 	else
diff --git a/post-install.sh b/post-install.sh
index f060916..bf93e93 100755
--- a/post-install.sh
+++ b/post-install.sh
@@ -115,7 +115,7 @@ shift $((OPTIND-1))
 [ -z "$INSTALL_USER" ] && [ "$INSTALL" != "PACKAGES" ] && echo "Error: <user> required" && usage
 
 check_user() {
-	HOME_DIR="$(awk -F: '$1 ~ /^'$1'$/ {print $6}' < /etc/passwd)"
+	HOME_DIR="$(awk -F: '$1 ~ /^'$1'$/ {print $6}' /etc/passwd)"
 	[ -z "$HOME_DIR" ] && echo "Error: User $1 does not exist" && return 1
 	return 0
 }