From 5a134c64c6422072780b73b97926589b267e7b5d Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 26 Mar 2012 14:38:51 -0500 Subject: [PATCH] card script: cleanup check_mmc Signed-off-by: Robert Nelson --- mk_mmc.sh | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 6d7177b..06aa07e 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1423,34 +1423,32 @@ function reset_scripts { } function check_mmc { + FDISK=$(LC_ALL=C fdisk -l 2>/dev/null | grep "Disk ${MMC}" | awk '{print $2}') - FDISK=$(LC_ALL=C fdisk -l 2>/dev/null | grep "Disk ${MMC}" | awk '{print $2}') - - if test "-$FDISK-" = "-$MMC:-" - then - echo "" - echo "I see..." - echo "fdisk -l:" - LC_ALL=C fdisk -l 2>/dev/null | grep "Disk /dev/" --color=never - echo "" - echo "mount:" - mount | grep -v none | grep "/dev/" --color=never - echo "" - read -p "Are you 100% sure, on selecting [${MMC}] (y/n)? " - [ "$REPLY" == "y" ] || exit - echo "" - else - echo "" - echo "Are you sure? I Don't see [${MMC}], here is what I do see..." - echo "" - echo "fdisk -l:" - LC_ALL=C fdisk -l 2>/dev/null | grep "Disk /dev/" --color=never - echo "" - echo "mount:" - mount | grep -v none | grep "/dev/" --color=never - echo "" - exit - fi + if [ "x${FDISK}" = "x${MMC}:" ] ; then + echo "" + echo "I see..." + echo "fdisk -l:" + LC_ALL=C fdisk -l 2>/dev/null | grep "Disk /dev/" --color=never + echo "" + echo "mount:" + mount | grep -v none | grep "/dev/" --color=never + echo "" + read -p "Are you 100% sure, on selecting [${MMC}] (y/n)? " + [ "${REPLY}" == "y" ] || exit + echo "" + else + echo "" + echo "Are you sure? I Don't see [${MMC}], here is what I do see..." + echo "" + echo "fdisk -l:" + LC_ALL=C fdisk -l 2>/dev/null | grep "Disk /dev/" --color=never + echo "" + echo "mount:" + mount | grep -v none | grep "/dev/" --color=never + echo "" + exit + fi } function is_omap {