remove androidviewclient

Dockerfile

@@ -19,12 +19,18 @@ RUN dpkg --add-architecture i386 && \
     apt-get -y dist-upgrade && \
     apt-get install -y --no-install-recommends openjdk-7-jdk apt-utils curl expect python-tk python-matplotlib nano git openssh-server telnet libc6:i386 libncurses5:i386 libstdc++6:i386 bsdmainutils patch
 
-RUN curl -O http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz && \
-    tar xfz android-sdk_r24.3.3-linux.tgz && \
+# RUN curl -O http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz && \
+#    tar xfz android-sdk_r24.3.3-linux.tgz && \
+#    rm -f android-sdk_r24.3.3-linux.tgz
+COPY docker_downloads/android-sdk_r24.3.3-linux.tgz /opt/
+RUN tar xfz android-sdk_r24.3.3-linux.tgz && \
     rm -f android-sdk_r24.3.3-linux.tgz
 
-RUN curl -O http://droidbox.googlecode.com/files/DroidBox411RC.tar.gz && \
-    tar xfz DroidBox411RC.tar.gz && \
+# RUN curl -O http://droidbox.googlecode.com/files/DroidBox411RC.tar.gz && \
+#    tar xfz DroidBox411RC.tar.gz && \
+#    rm -f DroidBox411RC.tar.gz
+COPY docker_downloads/DroidBox411RC.tar.gz /opt/
+RUN tar xfz DroidBox411RC.tar.gz && \
     rm -f DroidBox411RC.tar.gz
 
 # accept-licenses was taken from https://github.com/embarkmobile/android-sdk-installer and is Licensed under the MIT License.
@@ -41,14 +47,14 @@ ADD docker/fastdroid-vnc /build/
 ADD docker/install-fastdroid-vnc.sh /build/
 RUN /build/install-fastdroid-vnc.sh
 ADD docker/run.sh /build/
-ADD docker/start_droidbot.sh /build/
 #ADD docker/droidbox.py.patch /build/
 #RUN cd /opt/DroidBox_4.1.1/scripts && patch < /build/droidbox.py.patch
 
 # Add DroitBot
-RUN apt-get install -y --no-install-recommends python-setuptools
+RUN apt-get install -y --no-install-recommends python-setuptools python-pip
 ADD . /opt/DroidBot
-RUN python /opt/DroidBot/setup.py install
+RUN easy_install -q --upgrade androidviewclient
+RUN pip install -q /opt/DroidBot
 
 CMD ["NONE"]
 

DockerfileLocal

@@ -47,14 +47,14 @@ ADD docker/fastdroid-vnc /build/
 ADD docker/install-fastdroid-vnc.sh /build/
 RUN /build/install-fastdroid-vnc.sh
 ADD docker/run.sh /build/
-ADD docker/start_droidbot.sh /build/
 #ADD docker/droidbox.py.patch /build/
 #RUN cd /opt/DroidBox_4.1.1/scripts && patch < /build/droidbox.py.patch
 
 # Add DroitBot
-RUN apt-get install -y --no-install-recommends python-setuptools
+RUN apt-get install -y --no-install-recommends python-setuptools python-pip
 ADD . /opt/DroidBot
-RUN python /opt/DroidBot/setup.py install
+RUN easy_install -q --upgrade androidviewclient
+RUN pip install -q /opt/DroidBot
 
 CMD ["NONE"]
 

README.md

@@ -50,26 +50,27 @@ it records much information we don't need.
 
 ## Prerequisite
 
-1. `Java` version `1.6+`
-2. `Python` version `2.7`
-3. `Android SDK`, make sure that `platform_tools` and `tools` added to `PATH`
-4. (Optional) `DroidBox` version `4.1.1`
+1. `Python` version `2.7`
+2. `Android SDK`, make sure that `platform_tools` and `tools` added to `PATH`
+3. `androidviewclient`, install with `sudo easy_install --upgrade androidviewclient`,
+or refer to its [wiki](https://github.com/dtmilano/AndroidViewClient/wiki)
+4. (Optional) `DroidBox` version `4.1.1`, 
+download from [here](http://droidbox.googlecode.com/files/DroidBox411RC.tar.gz)
 
 ## Installation
 
-Clone this repo and cd to the directory.
-
-Run:
+Clone this repo and use pip install:
 
 ```shell
-python setup.py install
+git clone https://github.com/lynnlyc/droidbot.git
+pip install -e droidbot
 ```
 
 ## Usage
 
 1. Start an emulator (recommended) or connect to a device using adb.
 2. Start droidbot:
-`python start_droidbot.py -h`
+`droidbot -h`
 
 ### Usage with DroidBox (without docker)
 
@@ -93,9 +94,7 @@ sh startemu.sh droidbox
 
 Step 2. Start droidbot:
 ```
-git clone https://github.com/lynnlyc/droidbot.git
-cd droidbot
-python start_droidbot.py -a <sample.apk> -event dynamic -duration 100
+droidbot -a <sample.apk> -event dynamic -duration 100 -o droidbot_out
 ```
 
 ### Usage with Docker