close enough, cleanup formatting

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/10/merge
Robert Nelson 13 years ago
parent 45bfa203d9
commit 7bb96ad290

@ -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
@ -338,8 +338,8 @@ function actually_dl_netinstall {
function check_dl_netinstall {
MD5SUM=$(md5sum "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | awk '{print $1}')
if [ "=$TEST_MD5SUM=" != "=$MD5SUM=" ]; then
echo "Note: NetInstall md5sum has changed: $MD5SUM"
if [ "x${TEST_MD5SUM}" != "x${MD5SUM}" ] ; then
echo "Note: NetInstall md5sum has changed: ${MD5SUM}"
echo "-----------------------------"
rm -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" || true
actually_dl_netinstall
@ -356,7 +356,6 @@ function dl_netinstall_image {
echo "-----------------------------"
unset UBOOTWRAPPER
case "${DISTARCH}" in
maverick-armel)
TEST_MD5SUM=$MAVERICK_MD5SUM
@ -424,7 +423,6 @@ function dl_netinstall_image {
UBOOTWRAPPER=1
NETINSTALL="uInitrd"
;;
esac
if [ -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" ] ; then
@ -432,7 +430,6 @@ esac
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
@ -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}
@ -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
ARCH=armel
DIST="maverick"
ARCH="armel"
;;
natty)
DIST="natty"
ARCH="armel"
;;
oneiric)
DIST=oneiric
ARCH=armel
DIST="oneiric"
ARCH="armel"
;;
precise-armel)
DIST=precise
ARCH=armel
DIST="precise"
ARCH="armel"
;;
precise-armhf)
DIST=precise
ARCH=armhf
DIST="precise"
ARCH="armhf"
;;
quantal-armhf)
DIST="quantal"
ARCH="armhf"
;;
squeeze)
DIST=squeeze
ARCH=armel
DIST="squeeze"
ARCH="armel"
;;
wheezy-armel)
DIST="wheezy"
@ -1674,7 +1675,6 @@ function check_distro {
exit
;;
esac
DISTARCH="${DIST}-${ARCH}"
}
@ -1768,8 +1768,7 @@ while [ ! -z "$1" ]; do
--mmc)
checkparm $2
MMC="$2"
if [[ "${MMC}" =~ "mmcblk" ]]
then
if [[ "${MMC}" =~ "mmcblk" ]] ; then
PARTITION_PREFIX="p"
fi
check_root

Loading…
Cancel
Save