comment cleanup

1 files changed, 21 insertions, 14 deletions

diff --git a/archsetup.sh b/archsetup.sh
index 733af5a..ec46957 100755
--- a/archsetup.sh
+++ b/archsetup.sh
@@ -11,14 +11,18 @@ This script assumes the following of the base install
   though network-manager will be installed regardless
 
 Notes:
-This script creates a tmpfs RAM disk for all compilation.
+If using with the ZFS on Arch script, comment out the line that installs yay
+since it will already be installed.
+
 
 I define two levels of errors:
-* STOP: Issues that will halt forward progress, aborting this script.
+* CRASH: Issues that will halt forward progress, aborting this script.
 * ERROR: Issues not serious enough to prevent the script from continuing.
 Both are printed on screen and in the $logfile.
 Stderr is also printed to the $logfile for all relevant info.
 
+This script creates a tmpfs RAM disk for all compilation.
+
 Outstanding Tasks:
 
 '
@@ -30,7 +34,7 @@ Outstanding Tasks:
 ### Constants
 
 username="cjennings"
-password="welcome"  # change on first login. :)
+password="welcome"  # will be changed on first login. :)
 
 dwm_repo="https://git.cjennings.net/dwm.git"
 dmenu_repo="https://git.cjennings.net/dmenu.git"
@@ -176,7 +180,7 @@ prerequisites() {
     # go                - required to build yay, the aur installer
     # ntp               - must communicate with other servers in ordered manner
     # python            - required for python pip installs
-    # stow              - for placing the dotfiles
+    # stow              - places the dotfiles (see: https://bit.ly/41GmysO)
     # tar               - extract unix archives
     # vi                - should things go wrong, we'll need an editor
     # zsh               - we'll need a shell interpreter for yay; this is mine
@@ -279,7 +283,7 @@ create_user () {
 
     # give $username sudo nopasswd rights (required for aur installs)
     display "task" "granting permissions"
-    (echo "%$username ALL=(ALL) NOPASSWD: ALL #ArchSetup" >> /etc/sudoers) \
+    (echo "%$username ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers) \
         || error "error" "$action" "$?"
 
     # mount as ramdisk to speed aur/git build/installs
@@ -752,7 +756,6 @@ supplemental_software() {
     pacman_install ttf-meslo-nerd
     aur_install ttf-lato
 
-
 }
 
 ### Silent Boot
@@ -838,7 +841,11 @@ configure_snapshots() {
 
 outro() {
 
-    display "title" "Generating Statistics"
+    action="Cleanup" && display "title" "$action"
+    action="forcing user password change on first login" && display "task" "$action"
+    chage -d 0 "$username"  >> $logfile 2>&1 || error "error" "$action" "$?"
+
+    display "subtitle" "Statistics"
     action="identifying newly installed packages" && display "task" "$action"
     pacman -Q > "$packages_after"  || error "error" "$action" "$?"
     (comm -13 --nocheck-order "$packages_before" "$packages_after" > "$archsetup_packages")  || \
@@ -864,19 +871,19 @@ outro() {
 
 ### Installation Steps
 
-intro                   # take start stats
+intro               # take start stats
 
-prerequisites           # install software required to install software
-create_user             # create user in wheel with :nopasswd sudo
-user_customizations     # dotfiles
-aur_installer           # install yay
+prerequisites       # install software required to install software
+create_user         # create user in wheel with :nopasswd sudo
+user_customizations # dotfiles
+# aur_installer       # install yay (comment out if using zfsarch install first)
 essential_services
 desktop_environment
 developer_workstation
 supplemental_software
-silent_boot             # make booting less noisy
+# silent_boot             # make booting less noisy
 # configure_snapshots     # automatic snapshots added to grub menu for restoration
 
-outro                   # take end stats; show summary
+outro               # take end stats; show summary
 
 exit 0