From b0fc204ce4f5579232ce71a1dd2db297d87b1c49 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 11 Apr 2012 19:34:46 -0500
Subject: [PATCH] firmware: cleanup handling of the zd1211 firmware

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 4062e8f..41ff4b1 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -439,13 +439,6 @@ case "$DIST" in
 	LIBERTAS_FW=$(cat ${TEMPDIR}/dl/index.html | grep libertas | grep -v diff.gz | grep -v .dsc | grep -v orig.tar.gz | tail -1 | awk -F"\"" '{print $2}')
 	wget -c --directory-prefix="${DIR}/dl/${DISTARCH}" ${LIBERTAS_FW}
 	LIBERTAS_FW=${LIBERTAS_FW##*/}
-
-	#zd1211
-	rm -f ${TEMPDIR}/dl/index.html || true
-	wget --directory-prefix=${TEMPDIR}/dl/ ftp://ftp.us.debian.org/debian/pool/non-free/z/zd1211-firmware/
-	ZD1211_FW=$(cat ${TEMPDIR}/dl/index.html | grep zd1211 | grep -v diff.gz | grep -v tar.gz | grep -v .dsc | tail -1 | awk -F"\"" '{print $2}')
-	wget -c --directory-prefix="${DIR}/dl/${DISTARCH}" ${ZD1211_FW}
-	ZD1211_FW=${ZD1211_FW##*/}
         ;;
 esac
 
@@ -859,6 +852,17 @@ function dl_device_firmware {
 	esac
 }
 
+function add_zd1211_firmware {
+	if [ -f ${TEMPDIR}/dl/index.html ] ; then
+		rm -f ${TEMPDIR}/dl/index.html || true
+	fi
+	wget --directory-prefix=${TEMPDIR}/dl/ ftp://ftp.us.debian.org/debian/pool/non-free/z/zd1211-firmware/
+	ZD1211_FW=$(cat ${TEMPDIR}/dl/index.html | grep zd1211 | grep -v diff.gz | grep -v tar.gz | grep -v .dsc | tail -1 | awk -F"\"" '{print $2}')
+	wget -c --directory-prefix="${DIR}/dl/${DISTARCH}" ${ZD1211_FW}
+	ZD1211_FW=${ZD1211_FW##*/}
+	dpkg -x "${DIR}/dl/${DISTARCH}/${ZD1211_FW}" ${TEMPDIR}/initrd-tree
+}
+
 function initrd_add_firmware {
 	DL_WGET="wget --directory-prefix=${TEMPDIR}/initrd-tree/lib/firmware/"
 	echo ""
@@ -869,6 +873,10 @@ function initrd_add_firmware {
 	${DL_WGET} http://rcn-ee.net/firmware/carl9170/1.9.4/carl9170-1.fw
 	echo "-----------------------------"
 
+	echo "Adding: NonFree Firmware"
+	echo "-----------------------------"
+	add_zd1211_firmware
+
 	case "${DIST}" in
 	maverick)
 		dpkg -x "${DIR}/dl/${DISTARCH}/${MAVERICK_FW}" ${TEMPDIR}/initrd-tree
@@ -891,7 +899,6 @@ function initrd_add_firmware {
 		dpkg -x "${DIR}/dl/${DISTARCH}/${ATMEL_FW}" ${TEMPDIR}/initrd-tree
 		dpkg -x "${DIR}/dl/${DISTARCH}/${RALINK_FW}" ${TEMPDIR}/initrd-tree
 		dpkg -x "${DIR}/dl/${DISTARCH}/${LIBERTAS_FW}" ${TEMPDIR}/initrd-tree
-		dpkg -x "${DIR}/dl/${DISTARCH}/${ZD1211_FW}" ${TEMPDIR}/initrd-tree
 		;;
 	esac
 }