Fix up Android-SDK-r17

Removed duplicate sqlite3 tool from the stuff linked into bin. Made the bin scripts and they exec the actual tool in bin. Was necessary for the emulator tool to work. Should have done it this way in the first place really.

1 files changed, 13 insertions, 11 deletions

diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
index aaf48570c..0a4008ce3 100644
--- a/Library/Formula/android-sdk.rb
+++ b/Library/Formula/android-sdk.rb
@@ -7,8 +7,8 @@ class AndroidSdk < Formula
   version 'r17'
 
   def self.var_dirs
-    %w[platforms samples temp add-ons]
-    # TODO docs, google-market_licensing and platform-tools
+    %w[platforms samples temp add-ons sources system-images]
+    # TODO docs and platform-tools
     # See the long comment below for the associated problems
   end
 
@@ -20,11 +20,14 @@ class AndroidSdk < Formula
     mv 'SDK Readme.txt', prefix/'README'
     mv 'tools', prefix
 
-    %w[android apkbuilder ddms dmtracedump draw9patch emulator
-       emulator-arm emulator-x86 hierarchyviewer hprof-conv
-       lint mksdcard monkeyrunner sqlite3 traceview
-       zipalign].each do |tool|
-      (bin/tool).make_link(prefix/'tools'/tool)
+    %w[android apkbuilder ddms dmtracedump draw9patch etc1tool emulator
+    hierarchyviewer hprof-conv lint mksdcard monkeyrunner traceview
+    zipalign].each do |tool|
+      (bin/tool).write <<-EOS.undent
+        #!/bin/sh
+        TOOL="#{prefix}/tools/#{tool}"
+        exec "$TOOL" "$@"
+      EOS
     end
 
     # this is data that should be preserved across upgrades, but the Android
@@ -40,9 +43,8 @@ class AndroidSdk < Formula
       #!/bin/sh
       ADB="#{prefix}/platform-tools/adb"
       test -f "$ADB" && exec "$ADB" "$@"
-      echo Use the \\`android\\' tool to install adb.
+      echo Use the \\`android\\' tool to install the \\"Android SDK Platform-tools\\".
       EOS
-    (bin+'adb').chmod 0755
   end
 
   def caveats; <<-EOS.undent
@@ -51,8 +53,8 @@ class AndroidSdk < Formula
     NOTE you should tell Eclipse, IntelliJ etc. to use the Android-SDK found
     here: #{prefix}
 
-    You will have to install the platform-tools EVERY time this formula updates.
-    If you want to try and fix this then see the comment in this formula.
+    You will have to install the platform-tools and docs EVERY time this formula
+    updates. If you want to try and fix this then see the comment in this formula.
 
     You may need to add the following to your .bashrc: