close enough, cleanup formatting

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

mk_mmc.sh

@@ -124,7 +124,7 @@ function is_valid_addon {
 }
 
 function check_root {
-	if [[ $UID -ne 0 ]]; then
+	if [[ ${UID} -ne 0 ]] ; then
 		echo "$0 must be run as sudo user or root"
 		exit
 	fi
@@ -331,20 +331,20 @@ function remove_uboot_wrapper {
 function actually_dl_netinstall {
 	wget --directory-prefix="${DIR}/dl/${DISTARCH}" ${HTTP_IMAGE}/${DIST}/main/installer-${ARCH}/${NETIMAGE}/images/${BASE_IMAGE}/${NETINSTALL}
 	MD5SUM=$(md5sum "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | awk '{print $1}')
-	if [ "${UBOOTWRAPPER}" ]; then
+	if [ "${UBOOTWRAPPER}" ] ; then
 		remove_uboot_wrapper
 	fi
 }
 
 function check_dl_netinstall {
 	MD5SUM=$(md5sum "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | awk '{print $1}')
- if [ "=$TEST_MD5SUM=" != "=$MD5SUM=" ]; then
+	if [ "x${TEST_MD5SUM}" != "x${MD5SUM}" ] ; then
-  echo "Note: NetInstall md5sum has changed: $MD5SUM"
+		echo "Note: NetInstall md5sum has changed: ${MD5SUM}"
 		echo "-----------------------------"
 		rm -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" || true
 		actually_dl_netinstall
 	else
-  if [ "${UBOOTWRAPPER}" ]; then
+		if [ "${UBOOTWRAPPER}" ] ; then
 			remove_uboot_wrapper
 		fi
 	fi
@@ -356,7 +356,6 @@ function dl_netinstall_image {
 	echo "-----------------------------"
 
 	unset UBOOTWRAPPER
-
 	case "${DISTARCH}" in
 	maverick-armel)
 		TEST_MD5SUM=$MAVERICK_MD5SUM
@@ -424,15 +423,13 @@ function dl_netinstall_image {
 		UBOOTWRAPPER=1
 		NETINSTALL="uInitrd"
 		;;
+	esac
 
-esac
+	if [ -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" ] ; then
-
- if [ -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" ]; then
 		check_dl_netinstall
 	else
 		actually_dl_netinstall
 	 fi
-
 	echo "md5sum of NetInstall: ${MD5SUM}"
 }
 
@@ -444,6 +441,7 @@ function boot_uenv_txt_template {
 		cat > ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			#These video values are now set by default in the bootloader
 			#uncomment/change if you need something else
+
 			UENV_VRAM
 			UENV_FB
 			UENV_TIMING
@@ -681,7 +679,11 @@ function tweak_boot_scripts {
 		sed -i -e 's:VIDEO_OMAPFB_MODE:'$VIDEO_OMAPFB_MODE':g' ${TEMPDIR}/bootscripts/${ALL}
 
 		#UENV_TIMING -> dvimode=1280x720MR-16@60
+		if [ "x${ADDON}" == "xpico" ] ; then
+			sed -i -e 's:UENV_TIMING:dvimode=VIDEO_TIMING:g' ${TEMPDIR}/bootscripts/${ALL}
+		else
 			sed -i -e 's:UENV_TIMING:#dvimode=VIDEO_TIMING:g' ${TEMPDIR}/bootscripts/${ALL}
+		fi
 		sed -i -e 's:VIDEO_TIMING:'$VIDEO_TIMING':g' ${TEMPDIR}/bootscripts/${ALL}
 
 		#optargs=VIDEO_CONSOLE -> optargs=console=tty0
@@ -953,7 +955,7 @@ function initrd_preseed_settings {
 	chmod a+x ${TEMPDIR}/initrd-tree/usr/lib/finish-install.d/08rcn-ee-finish-installing-device
 	cp -v "${DIR}/scripts/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg
 
-	if [ "${SERIAL_MODE}" ];then
+	if [ "${SERIAL_MODE}" ] ; then
 		#Squeeze/Wheezy: keymaps aren't an issue with serial mode so disable preseed workaround:
 		sed -i -e 's:d-i console-tools:#d-i console-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg
 		sed -i -e 's:d-i debian-installer:#d-i debian-installer:g' ${TEMPDIR}/initrd-tree/preseed.cfg
@@ -969,7 +971,7 @@ function initrd_fixes {
 
 	#work around for the kevent smsc95xx issue
 	touch ${TEMPDIR}/initrd-tree/etc/sysctl.conf
-	if [ "${smsc95xx_mem}" ];then
+	if [ "${smsc95xx_mem}" ] ; then
 		echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> ${TEMPDIR}/initrd-tree/etc/sysctl.conf
 	fi
 }
@@ -1059,7 +1061,7 @@ function omap_fatfs_boot_part {
 	echo "-----------------------------"
 	parted --script ${MMC} set 1 boot on
 
-	if [ "$FDISK_DEBUG" ];then
+	if [ "${FDISK_DEBUG}" ] ; then
 		echo "Debug: Partition 1 layout:"
 		echo "-----------------------------"
 		fdisk -l ${MMC}
@@ -1135,7 +1137,7 @@ function populate_boot {
 
 		if [ ! "${bootloader_installed}" ] ; then
 			if [ "${spl_name}" ] ; then
-				if [ -f ${TEMPDIR}/dl/${MLO} ]; then
+				if [ -f ${TEMPDIR}/dl/${MLO} ] ; then
 					cp -v ${TEMPDIR}/dl/${MLO} ${TEMPDIR}/disk/${spl_name}
 					cp -v ${TEMPDIR}/dl/${MLO} ${TEMPDIR}/disk/backup/${spl_name}
 					echo "-----------------------------"
@@ -1143,13 +1145,13 @@ function populate_boot {
 			fi
 
 			if [ "${boot_name}" ] && [ ! "${IS_IMX}" ] ; then
-				if [ -f ${TEMPDIR}/dl/${UBOOT} ]; then
+				if [ -f ${TEMPDIR}/dl/${UBOOT} ] ; then
 					cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/${boot_name}
 				fi
 			fi
 
 			if [ "${boot_name}" ] ; then
-				if [ -f ${TEMPDIR}/dl/${UBOOT} ]; then
+				if [ -f ${TEMPDIR}/dl/${UBOOT} ] ; then
 					cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/backup/${boot_name}
 					echo "-----------------------------"
 				fi
@@ -1612,35 +1614,34 @@ function check_uboot_type {
 
 function check_distro {
 	unset IN_VALID_DISTRO
-
 	case "${DISTRO_TYPE}" in
-	natty)
-		DIST=natty
-		ARCH=armel
-		;;
 	maverick)
-		DIST=maverick
+		DIST="maverick"
-		ARCH=armel
+		ARCH="armel"
+		;;
+	natty)
+		DIST="natty"
+		ARCH="armel"
 		;;
 	oneiric)
-		DIST=oneiric
+		DIST="oneiric"
-		ARCH=armel
+		ARCH="armel"
 		;;
 	precise-armel)
-		DIST=precise
+		DIST="precise"
-		ARCH=armel
+		ARCH="armel"
 		;;
 	precise-armhf)
-		DIST=precise
+		DIST="precise"
-		ARCH=armhf
+		ARCH="armhf"
 		;;
 	quantal-armhf)
 		DIST="quantal"
 		ARCH="armhf"
 		;;
 	squeeze)
-		DIST=squeeze
+		DIST="squeeze"
-		ARCH=armel
+		ARCH="armel"
 		;;
 	wheezy-armel)
 		DIST="wheezy"
@@ -1674,7 +1675,6 @@ function check_distro {
 		exit
 		;;
 	esac
-
 	DISTARCH="${DIST}-${ARCH}"
 }
 
@@ -1745,7 +1745,7 @@ function usage {
 }
 
 function checkparm {
-    if [ "$(echo $1|grep ^'\-')" ];then
+	if [ "$(echo $1|grep ^'\-')" ] ; then
 		echo "E: Need an argument"
 		usage
 	fi
@@ -1754,7 +1754,7 @@ function checkparm {
 IN_VALID_UBOOT=1
 
 # parse commandline options
-while [ ! -z "$1" ]; do
+while [ ! -z "$1" ] ; do
 	case $1 in
 	-h|--help)
 		usage
@@ -1768,8 +1768,7 @@ while [ ! -z "$1" ]; do
 	--mmc)
 		checkparm $2
 		MMC="$2"
-	    if [[ "${MMC}" =~ "mmcblk" ]]
+		if [[ "${MMC}" =~ "mmcblk" ]] ; then
-            then
 			PARTITION_PREFIX="p"
 		fi
 		check_root
@@ -1856,7 +1855,7 @@ echo "-----------------------------"
 check_root
 detect_software
 
-if [ "${spl_name}" ] || [ "${boot_name}" ]; then
+if [ "${spl_name}" ] || [ "${boot_name}" ] ; then
 	if [ "${USE_LOCAL_BOOT}" ] ; then
 		local_bootloader
 	else