diff --git a/README.md b/README.md index c9c2986..9bfdb4f 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,17 @@ Or on [Ebay](https://www.ebay.com/sch/i.html?_nkw=orbic+rc400l) ## Setup -*NOTE: We don't currently support automated installs on windows, you will have to follow the manual install instructions below* 1. Download the latest [Rayhunter release bundle](https://github.com/EFForg/rayhunter/releases) and extract it. -**If you are installing from the cloned github repository please see the development instructions below, running `install-linux.sh` from the git tree will not work.** +**If you are installing from the cloned github repository please see the development instructions below, running `install.sh` from the git tree will not work.** 2. Turn on the Orbic device and plug it into your computer using a USB-C Cable. -2. Run the install script inside the bundle corresponding to your platform (`install-linux.sh`, `install-mac.sh`). The Linux installer has only been tested on the latest version of Ubuntu. If it fails you will need to follow the install steps outlined in **Development** below. -3. Once finished, Rayhunter should be running! You can verify this by visiting the web UI as described below. +3. On MacOS or Linux run the install script `install.sh`. +4. Once finished, Rayhunter should be running! You can verify this by visiting the web UI as described below. + +### Notes + * The install script has only been tested for Linux on the latest version of Ubuntu. If it fails you will need to follow the install steps outlined in **Development** below. + * The install script also won't work on older macs with intel chips, for those macs you will need to follow the instructions at https://github.com/EFForg/rayhunter/wiki/Install-Rayhunter-on-Mac-Intel-devices + * We don't currently support automated installs on windows, you will have to follow the manual install instructions below* ## Usage diff --git a/dist/install-linux.sh b/dist/install-linux.sh deleted file mode 100755 index 55204ab..0000000 --- a/dist/install-linux.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/env bash - -set -e -export SERIAL_PATH="./serial-ubuntu-latest/serial" - -if [ ! -x "$SERIAL_PATH" ]; then - echo "The serial binary cannot be found at $SERIAL_PATH. If you are running this from the git tree please instead run it from the latest release bundle https://github.com/EFForg/rayhunter/releases" - exit 1 -fi - -if ! command -v adb &> /dev/null; then - if [ ! -d ./platform-tools ] ; then - echo "adb not found, downloading local copy" - curl -O "https://dl.google.com/android/repository/platform-tools-latest-linux.zip" - unzip platform-tools-latest-linux.zip - fi - export ADB="./platform-tools/adb" -else - export ADB=`which adb` -fi - -. "$(dirname "$0")"/install-common.sh -install diff --git a/dist/install-mac.sh b/dist/install-mac.sh deleted file mode 100755 index 24dacdd..0000000 --- a/dist/install-mac.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -e - -export SERIAL_PATH="./serial-macos-latest/serial" -if [ ! -x "$SERIAL_PATH" ]; then - echo "The serial binary cannot be found at $SERIAL_PATH. If you are running this from the git tree please instead run it from the latest release bundle at https://github.com/EFForg/rayhunter/releases" - exit 1 -fi - -if ! command -v adb &> /dev/null; then - if [ ! -d ./platform-tools ]; then - echo "adb not found, downloading local copy" - curl -O "https://dl.google.com/android/repository/platform-tools-latest-darwin.zip" - unzip platform-tools-latest-darwin.zip - fi - export ADB="./platform-tools/adb" -else - export ADB=`which adb` -fi - -. "$(dirname "$0")"/install-common.sh -install diff --git a/dist/install-common.sh b/dist/install.sh similarity index 65% rename from dist/install-common.sh rename to dist/install.sh index 60b194a..ec1e0d4 100755 --- a/dist/install-common.sh +++ b/dist/install.sh @@ -1,18 +1,5 @@ #!/usr/bin/env bash -install() { - if [[ -z "${SERIAL_PATH}" ]]; then - echo "\$SERIAL_PATH not set, did you run this from install-linux.sh or install-mac.sh?" - exit 1 - fi - if [[ -z "${ADB}" ]]; then - echo "\$ADB not set, did you run this from install-linux.sh or install-mac.sh?" - exit 1 - fi - force_debug_mode - setup_rootshell - setup_rayhunter - test_rayhunter -} +set -e force_debug_mode() { echo "Using adb at $ADB" @@ -108,3 +95,38 @@ test_rayhunter() { done echo "timeout reached! failed to reach rayhunter url $URL, something went wrong :(" } + +##### ##### ##### +##### Main ##### +##### ##### ##### +if [[ `uname -s` == "Linux" ]]; then + export SERIAL_PATH="./serial-ubuntu-latest/serial" + export PLATFORM_TOOLS="platform-tools-latest-linux.zip" +elif [[ `uname -s` == "Darwin" && `uname -m` == "arm64" ]]; then + export SERIAL_PATH="./serial-macos-latest/serial" + export PLATFORM_TOOLS="platform-tools-latest-darwin.zip" +else + echo "This script only supports Linux or macOS with M1/M2 arm chips, for MacOS on Intel devices see the instructions here: https://github.com/EFForg/rayhunter/wiki/Install-Rayhunter-on-Mac-Intel-devices" + exit 1 +fi + +if [ ! -x "$SERIAL_PATH" ]; then + echo "The serial binary cannot be found at $SERIAL_PATH. If you are running this from the git tree please instead run it from the latest release bundle https://github.com/EFForg/rayhunter/releases" + exit 1 +fi + +if ! command -v adb &> /dev/null; then + if [ ! -d ./platform-tools ] ; then + echo "adb not found, downloading local copy" + curl -O "https://dl.google.com/android/repository/${PLATFORM_TOOLS}" + unzip $PLATFORM_TOOLS + fi + export ADB="./platform-tools/adb" +else + export ADB=`which adb` +fi + +force_debug_mode +setup_rootshell +setup_rayhunter +test_rayhunter