progress

etc/functions

@@ -22,6 +22,9 @@ input_old() {
 }
 
 header() {
+        if [ "$DEBUG" ]; then
+                read
+        fi
 	clear
 	echo "#### $1"
 }

main.sh

@@ -250,13 +250,13 @@ profile() {
 		reset packages
 		cp ./etc/profile/$PROFILE $tmp_target
 		if [ "$need_xserver" == "1" ]; then
-			xserver
+			packages xserver
 		fi
 		if [ "$need_gfx" == "1" ]; then
-			gfx
+			packages gfx
 		fi
 		if [ "$need_sound" == "1" ]; then
-			soundsystem
+			packages soundsystem
 		fi
 	fi
 }
@@ -335,6 +335,25 @@ network() {
 	fi
 }
 
+packages() {
+	WHICH="$1"
+	for i in $(find ./etc/${WHICH}/ -type f); do
+		choice+=("$(basename $i)")
+	done
+	if [ "${#choice[@]}" -gt "1" ]; then
+		header "$WHICH"
+		multiplechoice "${choice[@]}"
+	elif [ "${#choice[@]}" -eq "1" ]; then
+		output=${choice[0]}
+	fi
+	if ! [ "${#choice[@]}" -eq "0" ]; then
+		. ./etc/network/$NETWORK
+		packages
+		reset packages
+		cp ./etc/network/$NETWORK $tmp_target
+	fi
+}
+
 do_install() {
 	header "Installation"
 	mkdir -p ${target}/var/db/xbps/keys
@@ -401,13 +420,14 @@ target_phy_id
 use_efi
 encryption_style
 hibernation
+packages bootloader
 user
 lang
 hostname
 base
-bootloader
 profile
-printing 
+packages network
+packages printing 
 do_partition
 do_install
 do_chroot