Merge pull request #1653 from NativeScript/kerezov/setup-scripts-update

Improve Setup Scripts' Android bits

Author: Mitko-Kerezov

setup/native-script.ps1

@@ -71,16 +71,21 @@ Install "Google Chrome" "Installing Google Chrome (required to debug NativeScrip
 Install "Java Development Kit" "Installing Java Development Kit" "cinst jdk8 --force --yes"
 
 Install "Android SDK" "Installing Android SDK" "cinst android-sdk --force --yes"
-
-# setup android sdk
-echo yes | cmd /c "$env:localappdata\Android\android-sdk\tools\android" update sdk --filter "tools,platform-tools,android-23" --all --no-ui
-echo yes | cmd /c "$env:localappdata\Android\android-sdk\tools\android" update sdk --filter "build-tools-23.0.1,extra-android-m2repository" --all --no-ui
-
 # setup environment
 
 if (!$env:ANDROID_HOME) {
-	[Environment]::SetEnvironmentVariable("ANDROID_HOME", "$env:localappdata\Android\android-sdk", "User")
-	$env:ANDROID_HOME = "$env:localappdata\Android\android-sdk";
+	# in case the user has `android` in the PATH, use it as base for setting ANDROID_HOME
+	$androidExecutableEnvironmentPath = Get-Command android -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Definition
+	if ($androidExecutableEnvironmentPath -ne $null) {
+		$androidHomeJoinedPath = [io.path]::combine($androidExecutableEnvironmentPath, "..", "..")
+		$androidHome = Resolve-Path $androidHomeJoinedPath | Select-Object -ExpandProperty Path
+	}
+	else {
+		$androidHome = "$env:localappdata\Android\android-sdk"
+	}
+
+	$env:ANDROID_HOME = $androidHome;
+	[Environment]::SetEnvironmentVariable("ANDROID_HOME", "$env:ANDROID_HOME", "User")
 }
 
 if (!$env:JAVA_HOME) {
@@ -90,5 +95,16 @@ if (!$env:JAVA_HOME) {
 	$env:JAVA_HOME = $javaHome;
 }
 
+# setup android sdk
+# following commands are separated in case of having to answer to license agreements
+# the android tool will introduce a --accept-license option in subsequent releases
+$androidExecutable = [io.path]::combine($env:ANDROID_HOME, "tools", "android")
+echo y | cmd /c "$androidExecutable" update sdk --filter "tools" --all --no-ui
+echo y | cmd /c "$androidExecutable" update sdk --filter "platform-tools" --all --no-ui
+echo y | cmd /c "$androidExecutable" update sdk --filter "android-23" --all --no-ui
+echo y | cmd /c "$androidExecutable" update sdk --filter "build-tools-23.0.2" --all --no-ui
+echo y | cmd /c "$androidExecutable" update sdk --filter "extra-android-m2repository" --all --no-ui
+
+
 Write-Host -ForegroundColor Green "This script has modified your environment. You need to log off and log back on for the changes to take effect."
 Pause

setup/native-script.rb

@@ -82,19 +82,42 @@ def install(program_name, message, script, run_as_root = false, show_all_option
 end
 
 install("Java SE Development Kit", "Installing the Java SE Development Kit... This might take some time, please, be patient. (You will be prompted for your password)", 'brew cask install java', false, false)
-execute('echo "export JAVA_HOME=$(/usr/libexec/java_home)" >> ~/.profile', "Unable to set JAVA_HOME")
-
 install("Android SDK", "Installing Android SDK", 'brew install android-sdk')
-execute('echo "export ANDROID_HOME=/usr/local/opt/android-sdk" >> ~/.profile', "Unable to set ANDROID_HOME")
+
+unless ENV["ANDROID_HOME"]
+  require 'pathname'
+  # if android-sdk was installed through brew, there should be a symlink in /usr/local/opt/android-sdk pointing to the actual sdk
+  android_home = "/usr/local/opt/android-sdk"
+  unless Pathname.new(android_home).exist?
+    require 'mkmf'
+    # if there's no such symlink then try to find the `android-sdk` directory through the `android` executable
+    android_executable_environment_path = find_executable('android')
+    if android_executable_environment_path
+      android_home_joined_path = File.join(android_executable_environment_path, "..", "..")
+      android_home = Pathname.new(android_home_joined_path).realpath
+    end
+  end
+
+  ENV["ANDROID_HOME"] = android_home
+  execute('echo "export ANDROID_HOME=%s" >> ~/.profile' % ENV["ANDROID_HOME"], "Unable to set ANDROID_HOME")
+end
+
+unless ENV["JAVA_HOME"]
+  execute('echo "export JAVA_HOME=$(/usr/libexec/java_home)" >> ~/.profile', "Unable to set JAVA_HOME")
+end
 
 # the -p flag is set in order to ensure zero status code even if the directory exists
 execute("mkdir -p ~/.cocoapods", "There was a problem in creating ~/.cocoapods directory")
 install("CocoaPods", "Installing CocoaPods... This might take some time, please, be patient.", 'gem install cocoapods -V', true)
 
 puts "Configuring your system for Android development... This might take some time, please, be patient."
-# Note that multiple license acceptances may be required, hence the multiple y answers
+# Note that multiple license acceptances may be required, hence the multiple commands
 # the android tool will introduce a --accept-license option in subsequent releases
-execute("(for i in {1..5}; do echo y; sleep 4; done) | /usr/local/opt/android-sdk/tools/android update sdk --filter tools,platform-tools,android-23,build-tools-23.0.2,extra-android-m2repository --all --no-ui",
-	"There seem to be some problems with the Android configuration")
+android_executable = File.join(ENV["ANDROID_HOME"], "tools", "android")
+execute("echo y | #{android_executable} update sdk --filter tools --all --no-ui", "There seem to be some problems with the Android configuration")
+execute("echo y | #{android_executable} update sdk --filter platform-tools --all --no-ui", "There seem to be some problems with the Android configuration")
+execute("echo y | #{android_executable} update sdk --filter android-23 --all --no-ui", "There seem to be some problems with the Android configuration")
+execute("echo y | #{android_executable} update sdk --filter build-tools-23.0.2 --all --no-ui", "There seem to be some problems with the Android configuration")
+execute("echo y | #{android_executable} update sdk --filter extra-android-m2repository --all --no-ui", "There seem to be some problems with the Android configuration")
 
 puts "The ANDROID_HOME and JAVA_HOME environment variables have been added to your .profile. Restart the terminal to use them."