Update
Signed-off-by: Joel Fernandes <joel@linuxinternals.org>
diff --git a/src/addons/bashrc b/src/addons/bashrc
index 02fdeae..f6d8aa4 100644
--- a/src/addons/bashrc
+++ b/src/addons/bashrc
@@ -6,5 +6,7 @@
echo "# Welcome to androdeb environment running on Android #"
echo "# With great power comes great responsibility! #"
echo "# For questions: joel@linuxinternals.org #"
+echo " #"
+echo " Try running vim, gcc, clang, bcc, git, make etc. #"
echo "########################################################"
echo ""
diff --git a/src/addons/device-unpack b/src/addons/device-unpack
index b1eb5f2..40863ea 100755
--- a/src/addons/device-unpack
+++ b/src/addons/device-unpack
@@ -1,12 +1,5 @@
#!/system/bin/sh
-function die() {
- exit_code=$1
- msg=$2
- echo "ERROR: $msg (code $exit_code)"
- exit $exit_code
-}
-
set -e
# Script to do unpack of rootfs, ensures proper tear down
diff --git a/src/androdeb b/src/androdeb
index c96c933..3638cfb 100755
--- a/src/androdeb
+++ b/src/androdeb
@@ -1,7 +1,6 @@
#!/bin/bash -e
spath=$( cd "$(dirname "$0")" ; pwd -P )
curdir=$( pwd -P )
-
source $spath/utils/android
usage() {
@@ -52,6 +51,11 @@
# SHELL
##########################################################
if [[ ! -z ${ASHELL+x} ]]; then
+ set +e; adb shell ls /data/androdeb/debian/.bashrc > /dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ die 2 "Device doesn't have an androdeb environment, run \"./androdeb prepare\" first";
+ fi; set -e
+
echo "For a better shell experience, run the following commands:"
echo " adb shell"
echo " /data/androdeb/run"
diff --git a/src/utils/android b/src/utils/android
index b08c662..1581730 100755
--- a/src/utils/android
+++ b/src/utils/android
@@ -36,3 +36,10 @@
adb root
return $?
}
+
+die() {
+ exit_code=$1
+ msg=$2
+ echo "ERROR: $msg (code $exit_code)"
+ exit $exit_code
+}
