From c5d8e173f3b27d585d3b49c1d6cb0c354375b724 Mon Sep 17 00:00:00 2001 From: Corbin Davenport Date: Fri, 14 Feb 2014 23:03:23 -0500 Subject: [PATCH] chrome os/linux installation are now the same --- install.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index 20b524c..dac1447 100755 --- a/install.sh +++ b/install.sh @@ -45,20 +45,24 @@ if [ -f "/usr/bin/old_bins/chromeos-tpm-recovery" ]; then # Chrome OS echo " " exit 0 fi - if [ "$(arch)" == "arm" ]; then # Chrome OS on ARM CPU - echo "[WARN] The ADB binaries for ARM are out of date, and do not work on Android 4.2.2+" + if [ "$(arch)" == "i386" ] || [ "$(arch)" == "i486" ] || [ "$(arch)" == "i586" ] || [ "$(arch)" == "amd64" ] || [ "$(arch)" == "x86_64" ] || [ "$(arch)" == "i686" ]; then # Chrome OS on Intel x86/x86_64 CPU + echo "[INFO] Downloading ADB for Chrome OS [Intel CPU]..." + sudo curl -s -o $ADB "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-i386-adb?raw=true" -LOk + echo "[INFO] Downloading Fastboot for Chrome [Intel CPU]..." + sudo curl -s -o $FASTBOOT "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-i386-fastboot?raw=true" -LOk + elif [ "$(arch)" == "arm" ]; then # Chrome on ARM CPU + echo "[WARN] The ADB binaries for ARM are out of date, and do not work on Android 4.2.2+" echo "[INFO] Downloading ADB for Chrome OS [ARM CPU]..." sudo curl -s -o $ADB "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-arm-adb?raw=true" -LOk echo "[INFO] Downloading Fastboot for Chrome OS [ARM CPU]..." sudo curl -s -o $FASTBOOT "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-arm-fastboot?raw=true" -LOk - else # Chrome OS on Intel CPU - echo "[INFO] Downloading ADB for Chrome OS [Intel CPU]..." - sudo curl -s -o $ADB "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-i386-adb?raw=true" -LOk - echo "[INFO] Downloading Fastboot for Chrome OS [Intel CPU]..." - sudo curl -s -o $FASTBOOT "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-i386-fastboot?raw=true" -LOk + else + echo "[EROR] Your CPU platform could not be detected. Now exiting." + echo " " + exit 0 fi echo "[INFO] Downloading udev list..." - sudo curl -s -o $UDEV "http://github.com/corbindavenport/nexus-tools/blob/master/udev.txt?raw=true" -LOk + sudo curl -s -o $UDEV "http://github.com/corbindavenport/nexus-tools/blob/master/udev.txt" -LOk echo "[INFO] Making ADB and Fastboot executable..." sudo chmod +x $ADB sudo chmod +x $FASTBOOT @@ -81,7 +85,7 @@ elif [ "$(uname)" == "Darwin" ]; then # Mac OS X echo " " exit 0 elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Generic Linux - if [ "$(arch)" == "i386" ] || [ "$(arch)" == "i486" ] || [ "$(arch)" == "i586" ] || [ "$(arch)" == "amd64" ] || [ "$(arch)" == "x86_64" ] || [ "$(arch)" == "i686" ]; then # Linux on Intel x86/x86_64 CPU + if [ "$(arch)" == "i386" ] || [ "$(arch)" == "i486" ] || [ "$(arch)" == "i586" ] || [ "$(arch)" == "amd64" ] || [ "$(arch)" == "x86_64" ] || [ "$(arch)" == "i686" ]; then # Linux on Intel x86/x86_64 CPU echo "[INFO] Downloading ADB for Linux [Intel CPU]..." sudo curl -s -o $ADB "http://github.com/corbindavenport/nexus-tools/blob/master/bin/linux-i386-adb?raw=true" -LOk echo "[INFO] Downloading Fastboot for Linux [Intel CPU]..."