From 886a4f368cf3e793403b1b637e8f54f7a3ffb8e4 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Wed, 28 Apr 2010 14:23:50 -0700 Subject: SDK Setup fixes. - SDK Setup: cd to the SDK dir, to cope with the case where the setup is executed from a shortcut with a different base directory. - SDK Manager: properly detect "update sdk" and "update avds" commands. Change-Id: I1f0d32fffd71d3fa0856e753a80505f3dcd076d1 --- .../app/src/com/android/sdkmanager/CommandLineProcessor.java | 2 +- sdkmanager/app/src/com/android/sdkmanager/Main.java | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'sdkmanager/app') diff --git a/sdkmanager/app/src/com/android/sdkmanager/CommandLineProcessor.java b/sdkmanager/app/src/com/android/sdkmanager/CommandLineProcessor.java index d24bed4..6536baa 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/CommandLineProcessor.java +++ b/sdkmanager/app/src/com/android/sdkmanager/CommandLineProcessor.java @@ -115,7 +115,7 @@ class CommandLineProcessor { "Silent mode: only errors are printed out.", false); define(Mode.BOOLEAN, false, GLOBAL_FLAG_VERB, NO_VERB_OBJECT, "h", KEY_HELP, - "This help.", + "Help on a specific command.", false); } diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 58a9a98..49eee7e 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -232,6 +232,10 @@ public class Main { updateTestProject(); } else if (SdkCommandLine.OBJECT_LIB_PROJECT.equals(directObject)) { updateProject(true /*library*/); + } else if (SdkCommandLine.OBJECT_SDK.equals(directObject)) { + showMainWindow(true /*autoUpdate*/); + } else if (SdkCommandLine.OBJECT_ADB.equals(directObject)) { + updateAdb(); } } else if (SdkCommandLine.VERB_DELETE.equals(verb) && SdkCommandLine.OBJECT_AVD.equals(directObject)) { @@ -244,14 +248,6 @@ public class Main { } else if (verb == null && directObject == null) { showMainWindow(false /*autoUpdate*/); - } else if (SdkCommandLine.VERB_UPDATE.equals(verb) && - SdkCommandLine.OBJECT_SDK.equals(directObject)) { - showMainWindow(true /*autoUpdate*/); - - } else if (SdkCommandLine.VERB_UPDATE.equals(verb) && - SdkCommandLine.OBJECT_ADB.equals(directObject)) { - updateAdb(); - } else { mSdkCommandLine.printHelpAndExit(null); } -- cgit v1.1