Add stepmania user.

Author: root670

after-pacstrap.sh

@@ -8,8 +8,18 @@
 source constants.sh
 source helpers.sh
 
+PASSWORD=
+
+user_setup() {
+    echo -e "${GREEN}Creating new user${NC}"
+    useradd -m -G wheel $USERNAME
+    echo ${USERNAME}:${PASSWORD} | chpasswd -e
+}
+
 build_stepmania() {
     echo -e "${GREEN}Building StepMania${NC}"
+    begin_checked_section
+
     git clone --depth=1 https://github.com/stepmania/stepmania.git /stepmania
     mkdir /stepmania/build
     pushd /stepmania
@@ -25,20 +35,25 @@ build_stepmania() {
     cmake --install build --strip
     popd
     rm -rf /stepmania
+    chown -R ${USERNAME}:${USERNAME} /opt/stepmania-5.1/
+
+    end_checked_section
 }
 
 configure_settings() {
     echo -e "${GREEN}Setting up configuration files${NC}"
+    begin_checked_section
 
     # Set initial configuration for StepMania
     mkdir -p /opt/stepmania-5.1/Data
     cat <<EOF >> /opt/stepmania-5.1/Data/Static.ini
 [Options]
 Windowed=0
 EOF
+    chown ${USERNAME}:${USERNAME} /opt/stepmania-5.1/Data/Static.ini
 
     # Run stepmania when `startx` is run
-    cat <<EOF > ~/.xinitrc
+    cat <<EOF > /home/${USERNAME}/.xinitrc
 #!/bin/sh
 
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
@@ -50,24 +65,29 @@ fi
 
 exec /opt/stepmania-5.1/stepmania
 EOF
+    chown ${USERNAME}:${USERNAME} /home/${USERNAME}/.xinitrc
 
     # Automatically login as root
     mkdir -p /etc/systemd/system/[email protected]
     cat <<EOF > /etc/systemd/system/[email protected]/override.conf
 [Service]
 ExecStart=
-ExecStart=-/usr/bin/agetty --skip-login --nonewline --noissue --autologin root --noclear %I \$TERM
+ExecStart=-/usr/bin/agetty --skip-login --nonewline --noissue --autologin $USERNAME --noclear %I \$TERM
 EOF
 
     # Start X after login on tty1
-    cat <<EOF > ~/.bash_profile
+    cat <<EOF > /home/${USERNAME}/.bash_profile
 if [[ -z \$DISPLAY ]] && [[ \$(tty) = /dev/tty1 ]]; then
     startx -- -nocursor &>/dev/null
 fi
 EOF
+    chown ${USERNAME}:${USERNAME} /home/${USERNAME}/.bash_profile
 
     # Disable `Last login...` message
-    touch ~/.hushlogin
+    touch /home/${USERNAME}/.hushlogin
+    chown ${USERNAME}:${USERNAME} /home/${USERNAME}/.hushlogin
+
+    end_checked_section
 }
 
 timezone_setup() {
@@ -84,6 +104,9 @@ locale_setup() {
 }
 
 initramfs_setup() {
+    echo -e "${GREEN}Rebuilding initramfs${NC}"
+    begin_checked_section
+
     # Compress with lz4
     echo COMPRESSION=\"lz4\" >> /etc/mkinitcpio.conf
     echo COMPRESSION_OPTIONS=\"-9\" >> /etc/mkinitcpio.conf
@@ -118,10 +141,14 @@ EOF
 
     # Rebuild initramfs
     mkinitcpio -p linux
+
+    end_checked_section
 }
 
 bootloader_setup() {
     echo -e "${GREEN}Setting up bootloader${NC}"
+    begin_checked_section
+
     bootctl install
     local uuid=$(cat $UUID_PATH)
     cat <<EOF > /boot/loader/loader.conf
@@ -154,13 +181,26 @@ EOF
     if [[ "$(sha256sum /boot/EFI/systemd/systemd-bootx64.efi | cut -d' ' -f1)" == "$checksum" ]]; then
         echo -ne "\x90\x90\x90\x90\x90" | dd of=/boot/EFI/systemd/systemd-bootx64.efi bs=1 seek=40320 count=5 conv=notrunc
     fi
+
+    end_checked_section
 }
 
 cleanup() {
+    echo -e "${GREEN}Cleaning up${NC}"
     rm -rf /var/cache/pacman/pkg
     touch /tmp/success
 }
 
+# Parse arguments
+while [[ "$1" != "" ]]; do
+    case $1 in
+        --password ) shift; PASSWORD=$1 ;;
+        * ) echo "Invalid argument \"$1\""; exit 1 ;;
+    esac
+    shift
+done
+
+user_setup
 build_stepmania
 configure_settings
 timezone_setup

constants.sh

@@ -15,6 +15,7 @@ else
     exit 1
 fi
 readonly UUID_PATH='/uuid.tmp'
+readonly USERNAME='stepmania'
 
 # Change these variables as needed
 readonly KEYMAP='us'

helpers.sh

@@ -32,6 +32,11 @@ arch_chroot() {
     arch-chroot /mnt /bin/bash -c "${1}"
 }
 
+installation_canceled() {
+    echo -e "${RED}Installation canceled.${NC}"
+    exit 1
+}
+
 # Wrap one or more commands around `begin_checked_section` and
 # `end_checked_section` to exit the script early if any of the commands fail.
 #

install.sh

@@ -3,10 +3,26 @@
 source constants.sh
 source helpers.sh
 
+PASSWORD= # Set by user_setup()
 
 #
 # Main Functions
 #
+user_setup() {
+    password1=$(whiptail --passwordbox "Enter password for user 'stepmania':" 8 50 3>&1 1>&2 2>&3)
+    if ! [[ "$?" == "0" ]]; then installation_canceled; fi
+
+    password2=$(whiptail --passwordbox "Confirm password:" 8 50 3>&1 1>&2 2>&3)
+    if ! [[ "$?" == "0" ]]; then installation_canceled; fi
+
+    if [[ "$password1" == "$password2" ]]; then
+        PASSWORD=$(openssl passwd -6 "$password1")
+        return 0
+    else
+        whiptail --msgbox "Passwords do not match, try again." 0 0
+        user_setup # Prompt again.
+    fi
+}
 disk_setup() {
     umount -R /mnt &>/dev/null
     local drive_list=$(lsblk -dnlpo NAME,MODEL -e 7,11)
@@ -51,8 +67,7 @@ disk_setup() {
             exit 0
         fi
     else
-        echo Installation canceled.
-        exit 0
+        installation_canceled
     fi
 }
 
@@ -83,7 +98,7 @@ after_pacstrap() {
     begin_checked_section
     mkdir -p /mnt/after-pacstrap
     cp after-pacstrap.sh constants.sh helpers.sh /mnt/after-pacstrap
-    arch-chroot /mnt bash -c "cd /after-pacstrap && source after-pacstrap.sh"
+    arch-chroot /mnt bash -c "cd /after-pacstrap && bash after-pacstrap.sh --password '$PASSWORD'"
     rm -rf /mnt/after-pacstrap
     end_checked_section
 
@@ -106,6 +121,7 @@ finished() {
 check_root
 check_internet_connection
 
+user_setup
 disk_setup
 package_setup
 fstab_setup