refactor(installer): update pacstrap to use install/base.packages

1 file · +8 -7

M install/base/pacstrap.sh +8 -7

@@ -1,11 +1,8 @@
1	1		#!/bin/bash
2	2		# Install base system with pacstrap
3	3
4		-	gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Installing base system..."
5		-	gum style --padding "0 0 1 $PADDING_LEFT" "This may take a few minutes..."
6		-
7		-	# Read barebone package list
8		-	mapfile -t packages < <(grep -v '^#' "$ARCHUP_INSTALL/presets/barebone.packages" \| grep -v '^$')
	4	+	# Read base package list
	5	+	mapfile -t packages < <(grep -v '^#' "$ARCHUP_INSTALL/base.packages" \| grep -v '^$')
9	6
10	7		# Add kernel (selected in kernel.sh)
11	8		if [ -n "$ARCHUP_KERNEL" ]; then

@@ -25,8 +22,12 @@ if [ "$ARCHUP_ENCRYPTION" = "enabled" ]; then
25	22		echo "Adding cryptsetup for LUKS encryption" >> "$ARCHUP_INSTALL_LOG_FILE"
26	23		fi
27	24
28		-	# Install base system
29		-	pacstrap /mnt "${packages[@]}"
	25	+	# Install base system with spinner
	26	+	echo "Installing ${#packages[@]} packages: ${packages[*]}" >> "$ARCHUP_INSTALL_LOG_FILE"
	27	+	if ! run_with_spinner "Installing base system (${#packages[@]} packages)..." "pacstrap /mnt ${packages[*]}"; then
	28	+	gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "[ERROR] Base system installation failed"
	29	+	exit 1
	30	+	fi
30	31
31	32		gum style --foreground 2 --padding "1 0 1 $PADDING_LEFT" "[OK] Base system installed"
32	33

 #!/bin/bash
 # Install base system with pacstrap
-gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Installing base system..."
+# Read base package list
-gum style --padding "0 0 1 $PADDING_LEFT" "This may take a few minutes..."
+mapfile -t packages < <(grep -v '^#' "$ARCHUP_INSTALL/base.packages" | grep -v '^$')
-# Read barebone package list
-mapfile -t packages < <(grep -v '^#' "$ARCHUP_INSTALL/presets/barebone.packages" | grep -v '^$')
 # Add kernel (selected in kernel.sh)
 if [ -n "$ARCHUP_KERNEL" ]; then
   echo "Adding cryptsetup for LUKS encryption" >> "$ARCHUP_INSTALL_LOG_FILE"
 fi
-# Install base system
+# Install base system with spinner
-pacstrap /mnt "${packages[@]}"
+echo "Installing ${#packages[@]} packages: ${packages[*]}" >> "$ARCHUP_INSTALL_LOG_FILE"
+if ! run_with_spinner "Installing base system (${#packages[@]} packages)..." "pacstrap /mnt ${packages[*]}"; then
+  gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "[ERROR] Base system installation failed"
+  exit 1
+fi
 gum style --foreground 2 --padding "1 0 1 $PADDING_LEFT" "[OK] Base system installed"