From a1b6e9fefbb9714bc2419377a7745a757250768a Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Feb 2022 19:59:23 +0100
Subject: [PATCH] progress

---
 etc/base      | 3 ++-
 etc/functions | 9 ++-------
 main.sh       | 4 ++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/etc/base b/etc/base
index 07a08f0..7685974 100644
--- a/etc/base
+++ b/etc/base
@@ -84,11 +84,12 @@ echo "  done" >> /etc/runit/core-services/99-changepwuser.sh
 echo "  rm -rf /etc/runit/core-services/99-changepwuser.sh" >> /etc/runit/core-services/99-changepwuser.sh
 echo "fi" >> /etc/runit/core-services/99-changepwuser.sh
 
+touch /etc/xbps.d/10-ignore-firmware.conf
 { echo "#ignorepkg=linux-firmware-amd";
 echo "#ignorepkg=linux-firmware-intel";
 echo "#ignorepkg=linux-firmware-nvidia";
 echo "#ignorepkg=linux-firmware-broadcom";
-echo "#ignorepkg=wifi-firmware"; } > /etc/xbps.d/10-ignore-firmware.conf
+echo "#ignorepkg=wifi-firmware"; } >> /etc/xbps.d/10-ignore-firmware.conf
 chmod 755 /etc/xbps.d/10-ignore-firmware.conf
 
 cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh
diff --git a/etc/functions b/etc/functions
index 9fbd89f..94f4a32 100644
--- a/etc/functions
+++ b/etc/functions
@@ -135,12 +135,7 @@ readin() {
 }
 
 ignorepkg() {
-        local input=( ${@} )
-        for i in $(seq 0 "$(( ${#input[@]} - 1 ))"); do
-                touch "${target}"/etc/xbps.d/10-ignore-pkg.conf
-                if ! grep -q "${i}" "${target}"/etc/xbps.d/10-ignore-pkg.conf; then
-                        echo "ignorepkg=${i}" >> "${target}"/etc/xbps.d/10-ignore-pkg.conf
-                fi
-
+        for i in $@; do
+                ignorepkgs+=( "$i" )
         done
 }
diff --git a/main.sh b/main.sh
index e48c614..79df9a0 100755
--- a/main.sh
+++ b/main.sh
@@ -229,6 +229,10 @@ do_install() {
 	header "Installation"
 	mkdir -p "${target}/var/db/xbps/keys"
 	cp /var/db/xbps/keys/* "${target}/var/db/xbps/keys"
+	touch "${target}/etc/xbps.d/10-ignore-pkg.conf"
+	for i in "${ignorepkgs[@]}"; do
+		echo "ignorepkg=${i}" >> "${target}/etc/xbps.d/10-ignore-pkg.conf"
+	fi
 	xbps-install -Sy -R https://alpha.de.repo.voidlinux.org/current -r "${target}" "${pkgs[@]}"
 }