Add the ability to choose between different architectures

- Renamed Scripts to scripts.lst
- Script now restores tty configuration
- Removed xargs
- Removed install all option

custom-scripts/readme.md

@@ -6,14 +6,13 @@ Use this to Deploy rices/set up services/etc.
 Each configuration script should follow this structure:
 
 ```bash
-#!/usr/bin/env bash
+#!/bin/bash
 # NAME: Your Script Name
 # DESC: A brief description of what the script does.
 
 # Your script logic here
 ```
 
-If `# NAME:` is not found, install stage 2 will fall back to displaying the script's filename.
-If `# DESC:` is not found, "No description available." will be displayed instead.
+If NAME and DESC are not found, the script will default to the script's filename.
 
-Place the scripts under this folder, add the filename to `scripts.lst` (separate by newline) and they will show up in the installer.
+Place the scripts under this folder, add the filename to `scripts` (Separate by newline) and they will show up on the installer.

custom-scripts/scripts.lst

@@ -1 +1 @@
-i3wm.sh
+i3wm.sh

install-stage1.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 LOGFILE=/tmp/void-usb-install-log
-GIT_REPO_BASE="https://lostcave.ddnss.de/git/BodgeMaster/void-usb/raw/branch/master"
+GIT_REPO_BASE="https://lostcave.ddnss.de/git/BodgeMaster/void-minecraft-usb/raw/branch/master"
 
 function press_any_key {
   echo "Press any key to continue or Ctrl+c to abort..."
@@ -78,7 +78,9 @@ echo -n "Installing xmirror, squashfs-tools, wget... "
 xbps-install --yes xmirror wget >> $LOGFILE 2>&1
 echo "done"
 
-#TODO: Select keyboard layout by showing lists of what's present (directories for region, then files within)
+#TODO: If going down the path of extracting routines from void-installer, that should be done here
+
+#TODO: Select keyboard layout
 KBD_LAYOUT="de-latin1"
 
 clear
@@ -205,20 +207,21 @@ the chosen mirror from the config file it generates.
 "
 press_any_key
 xmirror
+#TODO: also remove CPU architecture
 TARGET_MIRROR="$(sed 's/repository=//;s|/musl$||' /etc/xbps.d/00-repository-main.conf)"
 
 
-#TODO: allow only 32 bit on a 32 bit system
 options=("x86_64" "x86_64 musl" "x86_32")
 while true; do
     echo "Select your desired architecture."
     for i in "${!options[@]}"; do
-        echo "$((i+1)): ${options[$i]}"
+        echo "$((i+1))) ${options[$i]}"
     done
 
-    read -p "Input your choice (number): " choice
+    read -p "Input your choice: " choice
 
-    if [ "$choice" -ge 1 ] && [ "$choice" -le "${#options[@]}" ]; then
+    # Funny loop in bash...
+    if [[ "$choice" =~ ^[0-9]+$ ]] && [ "$choice" -ge 1 ] && [ "$choice" -le "${#options[@]}" ]; then
         TARGET_TYPE="${options[$((choice-1))]}"
         break
     else
@@ -228,9 +231,12 @@ done
 
 echo "You selected: $TARGET_TYPE"
 
+#TODO: also add CPU architecture
 if grep "musl" <<< "$TARGET_TYPE"; then
   TARGET_MIRROR="$TARGET_MIRROR/musl"
-  TARGET_TYPE="$(sed -e 's/ musl//' <<< "$TARGET_TYPE")"
+  # Probably not the smartest idea, but since there is just one option for musl,
+  # I figured out this should do.
+  TARGET_TYPE="x86_64"
 fi
 
 echo -n "Copying repository keys... "
@@ -317,6 +323,8 @@ else
   echo "KEYMAP=\"$KBD_LAYOUT\"" >> /mnt/target/etc/rc.conf
 fi
 
+#TODO: Figure out how to configure keyboard for Xorg
+
 #TODO timezone
 
 clear
@@ -424,14 +432,28 @@ function get_stage2_file {
   wget --output-document="$STAGE2_DIR/$1" "$GIT_REPO_BASE/$1" >> $LOGFILE 2>&1
 }
 
-get_stage2_file "install-stage2.sh" >> $LOGFILE 2>&1
+get_stage2_file install-stage2.sh >> $LOGFILE 2>&1
 chmod 744 "$STAGE2_DIR/install-stage2.sh" >> $LOGFILE 2>&1
 
-# Stage 2 prefab environment/rice install scripts
-get_stage2_file "custom-scripts/scripts.lst"
-while read -r NEXT_SCRIPT; do
-  [ -n "$NEXT_SCRIPT" ] && get_stage2_file "custom-scripts/$NEXT_SCRIPT"
-done < "$STAGE2_DIR/custom-scripts/scripts.lst"
+function download_scripts {
+  local scripts_file="$1"
+  
+  # Read the scripts file line by line
+  while IFS= read -r script; do
+    # Call the function to download each script
+    get_stage2_file "custom-scripts/$script"
+  done < "$scripts_file"
+}
+
+# Create the custom-scripts directory
+CUSTOM_SCRIPTS_DIR="$STAGE2_DIR/custom-scripts"
+mkdir -p "$CUSTOM_SCRIPTS_DIR"
+
+# Download the scripts file into the custom-scripts folder
+SCRIPTS_FILE="scripts"  # The name of the scripts file in the custom-scripts folder
+get_stage2_file "custom-scripts/$SCRIPTS_FILE"
+
+download_scripts "$CUSTOM_SCRIPTS_DIR/$SCRIPTS_FILE"
 
 mv /mnt/target/etc/sv/agetty-tty1/conf /mnt/target/etc/sv/agetty-tty1/conf.bak >> $LOGFILE 2>&1
 echo 'if [ -x /sbin/agetty -o -x /bin/agetty ]; then

install-stage2.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 LOGFILE=/tmp/void-usb-install-log
-STAGE2_DIR="/opt/void-usb/installer/"
 
 function press_any_key {
   echo "Press any key to continue or Ctrl+c to abort..."
@@ -70,7 +69,6 @@ Alternatively, you can continue without internet but the system will be left in
       echo -n "."
     done
     echo " $INTERNET"
-    # TODO: allow to connect again if still no internet
   fi
 fi
 
@@ -81,20 +79,25 @@ if [ "$INTERNET" = "up" ]; then
 fi
 
 
+STAGE2_DIR="/opt/void-usb/installer/"  # Change this to your desired directory
 CONFIG_DIR="$STAGE2_DIR/custom-scripts"
+SCRIPT_LIST="$CONFIG_DIR/scripts.lst"
 SCRIPTS=()
 NAMES=()
 DESCRIPTIONS=()
 
+# Find all scripts and extract their names & descriptions
 echo "Scanning for configuration scripts in $CONFIG_DIR..."
 for script in "$CONFIG_DIR"/*.sh; do
     [ -f "$script" ] || continue  # Skip if no .sh files found
     SCRIPTS+=("$script")
 
-    SCRIPT_NAME=$(grep '^# NAME:' "$script" | sed 's/^# NAME:[[:space:]]*//')
+    # Extract name from "# NAME:" (first occurrence)
+    SCRIPT_NAME=$(grep -m1 '^# NAME:' "$script" | sed 's/^# NAME:[[:space:]]*//')
     [ -z "$SCRIPT_NAME" ] && SCRIPT_NAME="$(basename "$script")"
 
-    SCRIPT_DESC=$(grep '^# DESC:' "$script" | sed 's/^# DESC:[[:space:]]*//')
+    # Extract description from "# DESC:" (first occurrence)
+    SCRIPT_DESC=$(grep -m1 '^# DESC:' "$script" | sed 's/^# DESC:[[:space:]]*//')
     [ -z "$SCRIPT_DESC" ] && SCRIPT_DESC="No description available."
 
     NAMES+=("$SCRIPT_NAME")
@@ -107,51 +110,38 @@ if [ ${#SCRIPTS[@]} -eq 0 ]; then
     exit 1
 fi
 
+# Display menu dynamically
 echo "Available configurations:"
 for i in "${!SCRIPTS[@]}"; do
-    echo "$((i+1)): ${NAMES[i]} - ${DESCRIPTIONS[i]}"
+    echo "$((i+1))) ${NAMES[i]} - ${DESCRIPTIONS[i]}"
 done
-echo "$(( ${#SCRIPTS[@]} + 1 )): Exit"
+echo "$(( ${#SCRIPTS[@]} + 1 ))) Exit"
 
-CHOICE=0
-while ! (( CHOICE >= 1 && CHOICE <= ${#SCRIPTS[@]} )); do
-  read -p "Select an option [1-$((${#SCRIPTS[@]}+1))]: " CHOICE
-  if (( CHOICE >= 1 && CHOICE <= ${#SCRIPTS[@]} )); then
-      echo "Running: ${NAMES[CHOICE-1]}"
-      bash "${SCRIPTS[CHOICE-1]}"
-  elif (( CHOICE == ${#SCRIPTS[@]} + 1 )); then
-      echo "Exiting..."
-      break
-  else
-      echo "Invalid choice."
-  fi
-done
+# Get user input
+read -p "Select an option (1-${#SCRIPTS[@]}): " choice
 
+# Run selected script
+if (( choice >= 1 && choice <= ${#SCRIPTS[@]} )); then
+    echo "Running: ${NAMES[choice-1]}"
+    bash "${SCRIPTS[choice-1]}"
+elif (( choice == ${#SCRIPTS[@]} + 1 )); then
+    echo "Exiting..."
+    exit 0
+else
+    echo "Invalid choice."
+    exit 1
+fi
+
+# Stage 2 Tasks
 echo "Setting up user..."
 read -p "Enter username: " NEW_USER
-#TODO: let the user choose additional groups (suggest sane defaults for different use cases)
-#  cdrom? optical? storage? what they do?
-#  scanner
-#  network (check if this even still does anything)
-#  kvm
-#  audio, video
-#  dialout
-#  users (dows this even do anything)
-useradd -m -s /bin/bash -G wheel "$NEW_USER"
+useradd -m -G wheel "$NEW_USER"
 passwd "$NEW_USER"
 
 echo "Cleaning up installation files..."
-mv /mnt/target/etc/sv/agetty-tty1/conf.bak /mnt/target/etc/sv/agetty-tty1/conf >> $LOGFILE 2>&1
-if [ -f /root/.profile.bak ]; then
-  mv /root/.profile.bak /root/.profile
-else
-  rm /root/.profile
-fi
 rm -rf "$STAGE2_DIR"
 
-clear
-echo "To save the changes made to the system, a new system image needs to be created.
+echo "Restoring TTY1 configuration..."
+mv /mnt/target/etc/sv/agetty-tty1/conf.bak /mnt/target/etc/sv/agetty-tty1/conf >> $LOGFILE 2>&1
 
-The system will reboot now. While shutting down, you will be asked about creating a system image. Choose yes."
-
-reboot
+bash --norc --noprofile

notes_to_self.txt

@@ -1,4 +1,6 @@
 TODO:
+make sure that gufw works as intended
+check for Nvidia Optimus support - or make it happen somehow
 compare sizes of glibc and musl installations
 need xdg menu maker?
 adjust required USB stick and RAM size in README
@@ -7,27 +9,114 @@ do not rely on the RTC
   - use ntp to get time
     - only fall back to using rtc if offline
   - do not set the RTC
-make our own time zone selection
-keyboard?
+make our own or extract (if feasible) kb selection and time zone selection to hijack them for our purposes
+  - potentially interesting packages
+    - ckbcomp
+    - kbd-data
 overview of the installation process at the start
 overall progress indication (step x out of y)
 look into roxterm as an alternative terminal
 deal with the entropy thing that runs after rc.shutdown
+first run message in .xinitrc.d
+  - auto-removes itself
+  - displays README.txt on root dir of the F2FS partition
 add online check to all the selections that need internet
 sort out /etc/resolv.conf for the chroot
 set keyboard layout for initramfs
 tell user about expected GRUB error messaegs
-disable hibernate, warn about suspend
-use zswap
-rices: when shutting down, let Xorg exit first, then run `loginctl {poweroff,reboot}`
-  - this is needed so the user can interact with the console
+disable suspend and hibernate
+when shutting down, let Xorg exit first, then run `loginctl {poweroff,reboot}`
+add polkit to common packages
 https://github.com/aarnt/octoxbps
 system-image
   check that all output goes to current TTY
 
+package selections:
+  desktop
+    icewm-full
+      packages
+        -> audio applet -> volctl
+        -> system monitor, file browser, image viewer, text editor, archive manager
+        -> GUI package manager? GUI update manager?
+        -> notification daemon?
+        xscreensaver
+        blueman
+        -> BT support?
+      post-install
+        add ultimate.bashrc
+        add backgrounds
+        modify bashrc to auto-start X if not already running
+        kick off scripts in .xinitrc.d from .xinitrc
+        exec icewm-session from .xinitrc
+        add to .xinitrc.d
+          start pipewire, pipewire-pulse, wireplumber
+          start conky
+          start desktop applets
+            volctl &
+            nm-applet &
+            blueman-applet &
+          display README
+          start xscreensaver
+            xscreensaver --no-splash &
+          start conky
+            conky &
+        put README.txt with relevant information on root dir of F2FS partition
+          symlink to /home/README.txt
+        add a symlink ~/.local/bin/xterm that points to lxterminal
+        configure icewm
+          startup script
+            choose random background
+          configuration
+        configure conky
+        configure xscreensaver
+    icewm-lite
+      post-install
+        add ultimate.bashrc
+        modify bashrc to auto-start X if not already running
+        kick off scripts in .xinitrc.d from .xinitrc
+        exec icewm (not session) from .xinitrc
+        add to .xinitrc.d
+          start pipewire, pipewire-pulse, wireplumber
+          display README
+        put README.txt with relevant information on root dir of F2FS partition
+          symlink to /home/README.txt
+        configure icewm
+    none
+      post-install
+        add ultimate.bashrc
+        modify bashrc to display README
+        put README.txt with relevant information on root dir of F2FS partition
+          symlink to /home/README.txt
+
+
+musl downsides:
+  - no nvidia drivers
+  - may be janky in regards to running some Minecraft versions
+musl upsides:
+  - ??
 
 Stage 1:
   -> select kb layout
+  -> select installation type (x86_32/x86_64, glibc/musl)
   -> configure time zone
     -> selection dialog?
     -> symlink /etc/localtime
+
+Stage 2:
+  -> set up user
+    -> ask for username
+    -> run useradd (non-interactively)
+      -> useradd --groups "comma,separated,groups" --create-home --shell /bin/bash $USERNAME
+      -> groups: dialout users wheel
+      -> ?? groups:
+        -> cdrom optical - can listen to CDs? Can watch DVDs? Can mount / unmount CDs/DVDs?
+        -> storage - can mount / unmount disks from GUI?
+        -> scanner - can scan things (for example using XSane?)
+        -> network - can interface with NetworkManager?
+        -> kvm - can run QEMU?
+    -> run passwd (interactively)
+  -> clean up
+    -> mv /mnt/target/etc/sv/agetty-tty1/conf.bak /mnt/target/etc/sv/agetty-tty1/conf
+    -> if [ -f /mnt/target/root/.profile.bak ]; then mv /mnt/target/root/.profile.bak /mnt/target/root/.profile; else rm /mnt/target/root/.profile; fi
+    -> rm -r /opt/void-usb/installer
+  -> build new squashfs image and reboot