roll recovery tools into a single binary. fix up nandroid to work without deviceid requirement
diff --git a/nandroid/nandroid-mobile.sh b/nandroid/nandroid-mobile.sh
index e8ae697..ba4b85e 100755
--- a/nandroid/nandroid-mobile.sh
+++ b/nandroid/nandroid-mobile.sh
@@ -52,7 +52,6 @@
# 9. print success.
-DEVICEID=foo
RECOVERY=foo
echo "nandroid-mobile v2.1"
@@ -60,7 +59,7 @@
if [ "$1" == "" ]; then
echo "Usage: $0 {backup|restore} [/path/to/nandroid/backup/]"
- echo "- backup will store a full system backup on /sdcard/nandroid/$DEVICEID"
+ echo "- backup will store a full system backup on /sdcard/nandroid"
echo "- restore path will restore the last made backup for boot, system, recovery and data"
exit 0
fi
@@ -104,16 +103,11 @@
esac
# 1
-DEVICEID=`cat /proc/cmdline | sed "s/.*serialno=//" | cut -d" " -f1`
RECOVERY=`cat /proc/cmdline | grep "androidboot.mode=recovery"`
if [ "$RECOVERY" == "foo" ]; then
echo "error: not running in recovery mode, aborting"
exit 1
fi
-if [ "$DEVICEID" == "foo" ]; then
- echo "error: device id not found in /proc/cmdline, aborting"
- exit 1
-fi
if [ ! "`id -u 2>/dev/null`" == "0" ]; then
if [ "`whoami 2>&1 | grep 'uid 0'`" == "" ]; then
echo "error: must run as root, aborting"
@@ -178,7 +172,7 @@
;;
*)
echo "Usage: $0 {backup|restore} [/path/to/nandroid/backup/]"
- echo "- backup will store a full system backup on /sdcard/nandroid/$DEVICEID"
+ echo "- backup will store a full system backup on /sdcard/nandroid"
echo "- restore path will restore the last made backup for boot, system, recovery and data"
exit 1
;;
@@ -199,7 +193,7 @@
esac
TIMESTAMP="`date +%Y%m%d-%H%M`"
-DESTDIR="/sdcard/nandroid/$DEVICEID/$TIMESTAMP"
+DESTDIR="/sdcard/nandroid/$TIMESTAMP"
if [ ! -d $DESTDIR ]; then
mkdir -p $DESTDIR
if [ ! -d $DESTDIR ]; then