1 files changed, 9 insertions, 7 deletions

diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm
index 52525f4..79e5ba1 100644
--- a/src/mozclient/lib/MozClient/VCS.pm
+++ b/src/mozclient/lib/MozClient/VCS.pm
@@ -278,7 +278,7 @@ sub nobin_cleanup {
 
   $self->LOG("MozClient::nobin_cleanup()");
 
-  $self->chdir($self->work_dir . "/mozilla");
+  $self->chdir($self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'});
   my $cmd = sprintf "sh %s > REMOVED+${nobinonly}.txt 2>&1",
     $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
   $self->run_shell($cmd);
@@ -337,7 +337,8 @@ sub pack {
   }
   my $version = $tversion;
   $version .= "+${nobinonly}"
-    if -f $self->work_dir . "/mozilla/REMOVED+${nobinonly}.txt";
+    if -f $self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'} .
+          "/REMOVED+${nobinonly}.txt";
   my $cmd = sprintf "rm -rf %s/%s-%s", $self->work_dir,
     $self->{'MOZCLIENT_APPNAME'}, $version;
   $self->run_system($cmd);
@@ -351,14 +352,14 @@ sub pack {
     $project =~ s,/.*,,;
     if ($self->{'MOZCLIENT_WANTMOZDIR'}) {
       $self->chdir($self->work_dir);
-      my $cmd = sprintf "tar jcf %s-%s/%s-%s-source.tar.bz2 %s mozilla",
+      my $cmd = sprintf "tar jcf %s-%s/%s-%s-source.tar.bz2 %s %s",
         $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion,
-        $tar_exclude;
+        $tar_exclude, $self->{'MOZCLIENT_MOZDIRNAME'};
       $self->run_system($cmd);
       $self->chdir("..");
     }
     else { # Embedded tarball but without the toplevel mozilla dir
-      $self->chdir($self->work_dir . "/mozilla");
+      $self->chdir($self->work_dir . "/" . $self->{'MOZCLIENT_MOZDIRNAME'});
       my $cmd = sprintf "tar jcf ../%s-%s/%s-%s-source.tar.bz2 %s .",
         $self->{'MOZCLIENT_APPNAME'}, $version, $project, $tversion,
         $tar_exclude;
@@ -367,8 +368,9 @@ sub pack {
     }
   }
   else {
-    my $cmd = sprintf "mv %s/mozilla %s/%s-%s/",
-      $self->work_dir, $self->work_dir, $self->{'MOZCLIENT_APPNAME'}, $version;
+    my $cmd = sprintf "mv %s/%s %s/%s-%s/",
+      $self->work_dir, $self->{'MOZCLIENT_MOZDIRNAME'}, $self->work_dir,
+      $self->{'MOZCLIENT_APPNAME'}, $version;
     $self->run_system("$cmd");
   }
   $self->unlink($self->{'MOZCLIENT_APPNAME'} . "_$version.orig.tar.gz")