From 946812b3f8abbde6d756a493c063fb29a2f0e755 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Fri, 3 Apr 2020 22:37:19 +0200
Subject: [PATCH] Add extra menu

---
 archfi | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/archfi b/archfi
index ba736d0..a2f7ab3 100644
--- a/archfi
+++ b/archfi
@@ -904,7 +904,7 @@ archmenu(){
 	options+=("${txtedit//%1/mkinitcpio.conf}" "(${txtoptional})")
 	options+=("${txtedit//%1/mirrorlist}" "(${txtoptional})")
 	options+=("${txtbootloader}" "")
-	options+=("${txtenable//%1/dhcpcd}" "systemctl enable dhcpcd")
+	options+=("${txtextrasmenu}" "")
 	options+=("archdi" "${txtarchdidesc}")
 	sel=$(whiptail --backtitle "${apptitle}" --title "${txtarchinstallmenu}" --menu "" --cancel-button "${txtback}" --default-item "${nextitem}" 0 0 0 \
 		"${options[@]}" \
@@ -993,10 +993,10 @@ archmenu(){
 			;;
 			"${txtbootloader}")
 				archbootloadermenu
-				nextitem="${txtenable//%1/dhcpcd}"
+				nextitem="${txtextrasmenu}"
 			;;
-			"${txtenable//%1/dhcpcd}")
-				archenabledhcpcd
+			"${txtextrasmenu}")
+				archextrasmenu
 				nextitem="archdi"
 			;;
 			"archdi")
@@ -1676,16 +1676,29 @@ archrefindinstallchroot(){
 }
 
 
-archenabledhcpcd(){
-	if (whiptail --backtitle "${apptitle}" --title "${txtenable//%1/dhcpcd}" --yesno "${txtenable//%1/dhcpcd} ?" 0 0) then
-		clear
-		
-		echo "pacstrap /mnt dhcpcd"
-		
-		pacstrap /mnt dhcpcd
-		archchroot enabledhcpcd
-		pressanykey
+archextrasmenu(){
+	pkgs=""
+	options=()
+	options+=("nano" "" on)
+	options+=("vim" "" on)
+	options+=("dhcpcd" "" on)
+	options+=("dialog" "" on)
+	sel=$(whiptail --backtitle "${apptitle}" --title "${txtextrasmenu}" --checklist "" 0 0 0 \
+		"${options[@]}" \
+		3>&1 1>&2 2>&3)
+	if [ ! "$?" = "0" ]; then
+		return 1
 	fi
+	for itm in $sel; do
+		pkgs="$pkgs $(echo $itm | sed 's/"//g')"
+	done
+	clear
+	echo "pacstrap /mnt ${pkgs}"
+	pacstrap /mnt ${pkgs}
+	if [[ "${pkgs}" == *"dhcpcd"* ]]; then
+		archchroot enabledhcpcd
+	fi
+	pressanykey
 }
 archenabledhcpcdchroot(){
 	echo "systemctl enable dhcpcd"
@@ -1859,6 +1872,8 @@ loadstrings(){
 	txtbootloadersystemdmenu="Systemd-boot Install Menu"
 
 	txtbootloaderrefindmenu="rEFInd Install Menu"
+	
+	txtextrasmenu="Extras"
 
 	txtoptional="Optional"
 	txtrecommandeasyinst="Recommanded for easy install"