Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

1 files changed, 2 insertions, 2 deletions

diff --git a/bzr_download.function b/bzr_download.function
index 86d79180ca..9eab2916f9 100755
--- a/bzr_download.function
+++ b/bzr_download.function
@@ -8,7 +8,7 @@ function bzr_download() {
   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 &&
@@ -21,6 +21,6 @@ function bzr_download() {
   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
 }