From 9d8f9aeeba22827c9399801171244cff8a7d8d1d Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Sat, 11 Jan 2020 02:46:39 +0100
Subject: [PATCH] Update linux-firmware install method

---
 archfi | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/archfi b/archfi
index ba3c364..2cdea97 100644
--- a/archfi
+++ b/archfi
@@ -727,8 +727,7 @@ installmenu(){
   options=()
   options+=("${txtselectmirrorsbycountry}" "(${txtoptional})")
   options+=("${txteditmirrorlist}" "(${txtoptional})")
-  options+=("${txtinstallarchlinux}" "pacstrap base kernel")
-  options+=("${txtinstallfirmware}" "(${txtoptional}) pacstrap linux-firmware")
+  options+=("${txtinstallarchlinux}" "pacstrap base kernel firmwares")
   options+=("${txtconfigarchlinux}" "")
   sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtunmount}" --default-item "${nextitem}" 0 0 0 \
     "${options[@]}" \
@@ -745,13 +744,9 @@ installmenu(){
       ;;
       "${txtinstallarchlinux}")
         if(installbase) then
-          nextitem="${txtinstallfirmware}"
+          nextitem="${txtconfigarchlinux}"
         fi
       ;;
-      "${txtinstallfirmware}")
-        installfirmware
-        nextitem="${txtconfigarchlinux}"
-      ;;
       "${txtconfigarchlinux}")
         archmenu
         nextitem="${txtconfigarchlinux}"
@@ -798,18 +793,22 @@ installbase(){
   else
     return 1
   fi
+  options=()
+  options+=("linux-firmware" "(${txtoptional})" on)
+  sel=$(whiptail --backtitle "${apptitle}" --title "Firmwares" --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
   echo "pacstrap /mnt ${pkgs}"
   pacstrap /mnt ${pkgs}
   pressanykey
 }
 
-installfirmware(){
-  clear
-  echo "pacstrap /mnt linux-firmware"
-  pacstrap /mnt linux-firmware
-  pressanykey
-}
-
 unmountdevices(){
   clear
   echo "umount -R /mnt"