1 files changed, 7 insertions, 4 deletions
diff --git a/bzr_download.function b/bzr_download.function
index a0886308e7..9eab2916f9 100755
--- a/bzr_download.function
+++ b/bzr_download.function
@@ -2,10 +2,13 @@
 ## Handler for downloading from bzr URLs
 #---------------------------------------------------------------------
 function bzr_download() {
+  local URL="${SOURCE_URL%:*}"
+  URL="${URL#bzr_}"
+
   if file_exists $SOURCE_CACHE/$SOURCE
   then
     message "${MESSAGE_COLOR}Unpacking the source...${DEFAULT_COLOR}" &&
-    tar xjf $SOURCE_CACHE/$SOURCE &&
+    tar xjf $SOURCE_CACHE/$SOURCE -C $(dirname $SOURCE_DIRECTORY) &&
     cd $SOURCE_DIRECTORY &&
     message "${MESSAGE_COLOR}Updating...${DEFAULT_COLOR}" &&
     echo bzr update &&
@@ -13,11 +16,11 @@ function bzr_download() {
     cd -
   else
     message "${MESSAGE_COLOR}Doing a lightweight checkout...${DEFAULT_COLOR}" &&
-    echo bzr checkout --lightweight ${SOURCE_URL%:*} $SOURCE_DIRECTORY &&
-    bzr checkout --lightweight ${SOURCE_URL%:*} $SOURCE_DIRECTORY
+    echo bzr checkout --lightweight "$URL" "$SOURCE_DIRECTORY" &&
+    bzr checkout --lightweight "$URL" "$SOURCE_DIRECTORY"
   fi &&
 
   message "${MESSAGE_COLOR}Repacking the source...${DEFAULT_COLOR}" &&
-  tar cjf $SOURCE $SOURCE_DIRECTORY &&
+  tar cjf $SOURCE -C $(dirname $SOURCE_DIRECTORY) $(basename $SOURCE_DIRECTORY) &&
   mv $SOURCE $SOURCE_CACHE
 }