diff --git a/README.md b/README.md index 87c60f0a0285505c0101a1636609b59d29719a4b..047d5f69937e34608f4436cd0ecb4307da01886b 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,14 @@ Stop daemon and client: ## Ubuntu 15.10 host Android device +This script does not automate the installation of any Android development tools. + First ensure that you can build and install a minimal Android App on your device, e.g. <https://github.com/cirosantilli/android-cheat/tree/214fab34bb0e1627ac73e43b72dee7d1f8db7bfb/min> This will at least require installing the SDK. All executables used must be in your `PATH`, e.g. `adb`. -Then build and install on all devices with: +Then build and install on all connected devices with: ./ubuntu-15.10-android-install-all-devices.sh diff --git a/client-android b/client-android index 01dd7b25a5a6681df1c8053e14eb4b92aedb5fb5..4423b10e1dd8601d00486e1b78d39180cb45f410 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit 01dd7b25a5a6681df1c8053e14eb4b92aedb5fb5 +Subproject commit 4423b10e1dd8601d00486e1b78d39180cb45f410 diff --git a/client-gnome b/client-gnome index 26cd160c13c062e9d08c784370156b9712e631e6..066e33b128e44a2cf1dfe388d915cc6e7f21a9e6 160000 --- a/client-gnome +++ b/client-gnome @@ -1 +1 @@ -Subproject commit 26cd160c13c062e9d08c784370156b9712e631e6 +Subproject commit 066e33b128e44a2cf1dfe388d915cc6e7f21a9e6 diff --git a/client-windows b/client-windows index 9c3e7f78f86629ca23847c68f8c521719bb9f318..389a229654e1b2fe6d3fd020b15acef169f6b32b 160000 --- a/client-windows +++ b/client-windows @@ -1 +1 @@ -Subproject commit 9c3e7f78f86629ca23847c68f8c521719bb9f318 +Subproject commit 389a229654e1b2fe6d3fd020b15acef169f6b32b diff --git a/daemon b/daemon index 927f3b9cfdbad6ba8744b905ce48adb9e804a652..8f8eb254a522faded0190b769ac0da2e7606a118 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 927f3b9cfdbad6ba8744b905ce48adb9e804a652 +Subproject commit 8f8eb254a522faded0190b769ac0da2e7606a118 diff --git a/lrc b/lrc index dcf6195e113c50ba5dac65fa99d2fe8211a55778..0e79b741d9a139f4fc46ff98cececbf9ea4fefdf 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit dcf6195e113c50ba5dac65fa99d2fe8211a55778 +Subproject commit 0e79b741d9a139f4fc46ff98cececbf9ea4fefdf diff --git a/ubuntu-15.10-android-install-all-devices.sh b/ubuntu-15.10-android-install-all-devices.sh index ec09183783ef507ff173bbf82e78b54a262de59e..f22c2a8b2ee207ad6d5f6560893bf4209712e13c 100755 --- a/ubuntu-15.10-android-install-all-devices.sh +++ b/ubuntu-15.10-android-install-all-devices.sh @@ -4,5 +4,6 @@ set -e ./ubuntu-15.10-dependencies.sh cd client-android ./compile.sh +# TODO use gradlew instead. # From: http://stackoverflow.com/questions/8610733/how-can-i-adb-install-an-apk-to-multiple-connected-devices adb devices | tail -n +2 | cut -sf 1 | xargs -i'{}' adb -s '{}' install ring-android/app/build/outputs/apk/app-debug.apk diff --git a/ubuntu-15.10-run.sh b/ubuntu-15.10-run.sh index 340324f28e36bb766122f740b830b4284e25c26f..ca418d5ba7bac6257fb87efa5562c6b60bfb5bf1 100755 --- a/ubuntu-15.10-run.sh +++ b/ubuntu-15.10-run.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Run local install daemon and client that have\ # been installed with the install script on the background. +cd "$(dirname "${BASH_SOURCE[0]}")" ./install/daemon/libexec/dring >>daemon.log 2>&1 & echo $! >daemon.pid LD_LIBRARY_PATH="$LD_LIBRARY_PATH:install/lrc/lib" ./install/client-gnome/bin/gnome-ring >>client-gnome.log 2>&1 & diff --git a/ubuntu-15.10-stop.sh b/ubuntu-15.10-stop.sh index 13604abc65d3d361f8a5509aad75d3a54e850ef1..688794e9386596901177a79a4e840f5c7f7fdf12 100755 --- a/ubuntu-15.10-stop.sh +++ b/ubuntu-15.10-stop.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash # Stop local install daemon and client that have been installed with the install script. +cd "$(dirname "${BASH_SOURCE[0]}")" kill "$(cat client-gnome.pid)" kill "$(cat daemon.pid)"