From 9888f2038e1f7e99723d6e3b7369b15afd2599f5 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Wed, 10 Jun 2009 19:35:50 -0700
Subject: [PATCH] SDK Updater: fix install in new directory.

Also change the getenv hack so that multiple sources
can be specified, separated by ;
---
 .../android/sdklib/internal/repository/Archive.java    | 10 +++++-----
 .../internal/repository/UpdaterWindowImpl.java         |  9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
index 715311a23..ab58adf2d 100755
--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
@@ -586,12 +586,12 @@ public class Archive implements IDescription {
                             destFolder.getPath());
                     return false;
                 }
+            }
 
-                if (!unzipDestFolder.mkdirs()) {
-                    monitor.setResult("Failed to create temp directory %1$s",
-                            unzipDestFolder.getPath());
-                    return false;
-                }
+            if (!unzipDestFolder.mkdirs()) {
+                monitor.setResult("Failed to create directory %1$s",
+                        unzipDestFolder.getPath());
+                return false;
             }
 
             if (!unzipFolder(archiveFile, getSize(), unzipDestFolder, desc, monitor)) {
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
index 3e98faecd..c788eebb5 100755
--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
@@ -317,9 +317,12 @@ public class UpdaterWindowImpl {
         mUpdaterData.getSources().add(
                 new RepoSource(SdkRepository.URL_GOOGLE_SDK_REPO_SITE, false /* addonOnly */));
 
-        String url = System.getenv("TEMP_SDK_URL"); // TODO STOPSHIP temporary remove before shipping
-        if (url != null) {
-            mUpdaterData.getSources().add(new RepoSource(url, false /* addonOnly */));
+        String str = System.getenv("TEMP_SDK_URL"); // TODO STOPSHIP temporary remove before shipping
+        if (str != null) {
+            String[] urls = str.split(";");
+            for (String url : urls) {
+                mUpdaterData.getSources().add(new RepoSource(url, false /* addonOnly */));
+            }
         }
 
         mRemotePackagesPage.setInput(mUpdaterData.getSourcesAdapter());