summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadios Jonquil <ladios.jonquil@gmail.com>2011-08-23 04:44:23 +0800
committerLadios Jonquil <ladios.jonquil@gmail.com>2011-08-23 04:51:17 +0800
commitd21e83726d587b492637ad47f9aa5755d2bacc1d (patch)
tree99d37bd98058ee14fdcc4eeee35274b89202d201
parentc3db3dfee75b5a3c455bd3da9c8e5e5aab599a1b (diff)
downloadreplicant_build-d21e83726d587b492637ad47f9aa5755d2bacc1d.zip
replicant_build-d21e83726d587b492637ad47f9aa5755d2bacc1d.tar.gz
replicant_build-d21e83726d587b492637ad47f9aa5755d2bacc1d.tar.bz2
envsetup: eat safely
Change-Id: I2d8b52206213d8f4d8dcce3518cadb2be59e78d8
-rw-r--r--envsetup.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/envsetup.sh b/envsetup.sh
index f86384b..56b394b 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -630,16 +630,22 @@ function eat()
if [ "$OUT" ] ; then
MODVERSION=`sed -n -e'/ro\.modversion/s/^.*CyanogenMod-//p' $OUT/system/build.prop`
ZIPFILE=$OUT/update-cm-$MODVERSION-signed.zip
+ if [ $(adb get-state) != device ] ; then
+ echo "No device is online. Waiting for one..."
+ adb wait-for-device
+ fi
echo "Pushing update-cm-$MODVERSION-signed.zip to device"
- adb push $ZIPFILE /mnt/sdcard/
- cat << EOF > /tmp/extendedcommand
+ if adb push $ZIPFILE /mnt/sdcard/ ; then
+ cat << EOF > /tmp/extendedcommand
ui_print("Nom nom nom nom...");
install_zip("/sdcard/update-cm-$MODVERSION-signed.zip");
EOF
- adb push /tmp/extendedcommand /cache/recovery/
- rm /tmp/extendedcommand
- echo "Rebooting into recovery for installation"
- adb reboot recovery
+ if adb push /tmp/extendedcommand /cache/recovery/ ; then
+ echo "Rebooting into recovery for installation"
+ adb reboot recovery
+ fi
+ rm /tmp/extendedcommand
+ fi
else
echo "Nothing to eat"
return 1