commit b4c80a6ebd6fc3503ad68b87cd24bad3b7b8db65
author Joel Fernandes <joel@linuxinternals.org> Mon Apr 02 22:37:22 2018 -0700
committer Joel Fernandes <joel@linuxinternals.org> Mon Apr 02 22:48:18 2018 -0700
tree dafb9d23b0e098f83e3676ca4b112e3dd2e8c111
parent 02939a36a78e96fc8d60a957c1a8269e2b00b656

Fix multidev support and add remove command

Signed-off-by: Joel Fernandes <joel@linuxinternals.org>

androdeb

diff --git a/androdeb b/androdeb
index d2fa562..1ca680c 100755
--- a/androdeb
+++ b/androdeb
@@ -25,6 +25,7 @@
 case $key in
     prepare) PREPARE=1;     shift || true;    ;;
     shell) ASHELL=1;     shift || true;     ;;
+    remove) REMOVE=1;     shift || true;     ;;
     --archive) TARF=$2; shift || true; shift || true; ;;
     --tracers) source $spath/packages/tracers; shift || true; ;;
     --compilers) source $spath/packages/compilers; shift || true; ;;
@@ -47,13 +48,18 @@
 
 if [[ ! -z ${TARDIR+x} ]] && [[ ! -d $TARDIR ]]; then die 7 "Tar dir specified doesn't exist"; fi
 
-do_adb_root || die 3 "adb root failed, make sure:
+do_adb_root "$ADB" || die 3 "adb root failed, make sure:
 - If multiple devices connected, provide --device <serialno>  (or -s <serialno>)
 - Try to run \"adb root\" manually and see if it works. Typically this needs a userdebug build.
 
 Note: adb can be typically obtained using the android-adb-tools or the adb
 packages on your distro, or by installing the Android SDK."
 
+if [ ! -z "$REMOVE" ]; then
+	die_if_no_androdeb "Nothing to remove."
+	$ADB shell /data/androdeb/device-umount-all;
+	$ADB shell rm -rf /data/androdeb; exit 0; fi
+
 ##########################################################
 #  SHELL
 ##########################################################
@@ -76,8 +82,7 @@
 }
 
 function push_unpack_headers() {
-	$ADB shell ls /data/androdeb/debian > /dev/null 2>&1
-	if [ $? -ne 0 ]; then die 8 "Existing androdev env not found to update kernel headers into."; fi
+	die_if_no_androdeb "Couldn't update headers."
 
 	$ADB shell rm -rf /data/androdeb/debian/kernel-headers/
 	$ADB shell mkdir  /data/androdeb/debian/kernel-headers/
@@ -142,7 +147,7 @@
 PACKAGES+="$DEFAULT_PACKAGES"
 echo "Using temporary directory: $TDIR"
 
-if [[ $EUID -ne 0 ]]; then echo "The next stage needs root. You may be accessed for root password."; fi
+if [[ $EUID -ne 0 ]]; then echo ""; echo "Please enter your root password for next stage:"; fi
 sudo qemu-debootstrap --arch arm64 --include=$(make_csv "$PACKAGES") \
 	$DISTRO $OUT_TMP http://deb.debian.org/debian/
 

utils/android

diff --git a/utils/android b/utils/android
index 0dbff7d..7ad11be 100755
--- a/utils/android
+++ b/utils/android
@@ -33,7 +33,8 @@
 }
 
 do_adb_root() {
-	adb root > /dev/null 2>&1
+	ADB="$1"
+	$ADB root > /dev/null 2>&1
 	return $?
 }
 
@@ -43,3 +44,10 @@
 	echo "ERROR: $msg"
 	exit $exit_code
 }
+
+die_if_no_androdeb() {
+	set +e
+	$ADB shell ls /data/androdeb/debian > /dev/null 2>&1
+	if [ $? -ne 0 ]; then die 8 "Existing androdeb env not found on device. $1"; fi
+	set -e
+}