From d5e7a410e61ef9dd6c6ece6e3b420dbc0f1d252c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?=
 <yps@yaroslavps.com>
Date: Mon, 6 Feb 2023 01:46:09 +0300
Subject: progs list and minor fixes/changes

---
 boobs.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'boobs.sh')

diff --git a/boobs.sh b/boobs.sh
index d19b90a..a56df17 100755
--- a/boobs.sh
+++ b/boobs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# BOOBS: Base OS and Options Bootstrapping Script
+# BOOBS: Base OS Options Bootstrapping Script
 # Yaroslav de la Peña Smirnov <yps@yaroslavps.com>
 # based on Luke's Auto Rice Boostrapping Script (LARBS)
 # by Luke Smith <luke@lukesmith.xyz>
@@ -9,7 +9,7 @@
 ### OPTIONS AND VARIABLES ###
 
 dotfilesrepo="https://git.yaroslavps.com/configs/swayrice"
-progsfile=""
+progsfile="progs.csv"
 aurhelper="yay"
 
 
@@ -27,7 +27,7 @@ error() {
 
 welcomemsg() {
 	whiptail --title "Welcome!" \
-		--msgbox "Welcome to the Base OS and Options Bootstrapping Script!\\n\\nThis script will automatically install a fully-featured Linux desktop, which I use as my main machine.\\n\\n-Luke" 10 60
+		--msgbox "Welcome to the Base OS Options Bootstrapping Script!\\n\\nThis script will automatically install a fully-featured Linux desktop, which I use as my main machine.\\n" 10 60
 
 	whiptail --title "Important Note!" --yes-button "All ready!" \
 		--no-button "Return..." \
@@ -69,6 +69,7 @@ adduserandpass() {
 	# Adds user `$name` with password $pass1.
 	whiptail --infobox "Adding user \"$name\"..." 7 50
 	useradd -m -s /bin/zsh "$name"
+	rm -r /home/$name/*
 	export repodir="/home/$name/src"
 	export pkgbuildsdir="/home/$name/src/pkgbuilds"
 	export dotsdir="/home/$name/src/personal"
@@ -164,7 +165,7 @@ installationloop() {
 		curl -Ls "$progsfile" | sed '/^#/d' >/tmp/progs.csv
 	total=$(wc -l </tmp/progs.csv)
 	aurinstalled=$(pacman -Qqm)
-	while IFS=, read -r tag program comment; do
+	while IFS=$'\t' read -r tag program comment; do
 		n=$((n + 1))
 		echo "$comment" | grep -q "^\".*\"$" &&
 			comment="$(echo "$comment" | sed -E "s/(^\"|\"$)//g")"
@@ -251,8 +252,7 @@ sed -i "s/-j2/-j$(nproc)/;/^#MAKEFLAGS/s/^#//" /etc/makepkg.conf
 # and all build dependencies are installed.
 installationloop
 
-# Install the dotfiles in the user's home directory, but remove .git dir and
-# other unnecessary files.
+# Install the dotfiles in the user's home directory
 putdotfiles "$dotfilesrepo" "$repobranch"
 
 # Allow wheel users to sudo with password and allow several system commands
-- 
cgit v1.2.3