* [mozclient] rename exec/exec2 into run_system/run_shell

  - update src/mozclient.pl

1 files changed, 20 insertions, 20 deletions

diff --git a/src/mozclient.pl b/src/mozclient.pl
index ded3a46..760cf5c 100755
--- a/src/mozclient.pl
+++ b/src/mozclient.pl
@@ -127,7 +127,7 @@ sub cleanup_dir {
 
   if (-d $work_dir) {
     $self->LOG("MozClient::cleanup_dir()");
-    $self->exec("rm -rf $work_dir");
+    $self->run_system("rm -rf $work_dir");
   }
 }
 
@@ -139,7 +139,7 @@ sub prepare_dir {
   $self->mkdir($work_dir, 0755);
 }
 
-sub exec {
+sub run_system {
   my $self = shift;
 
   $self->LOG2("\$ %s", @_);
@@ -149,7 +149,7 @@ sub exec {
   $ret == 0 || carp "Can't run '$cmd': error code $ret\n";
 }
 
-sub exec2 {
+sub run_shell {
   my $self = shift;
 
   $self->LOG2("\$ %s", @_);
@@ -201,7 +201,7 @@ sub do_post_co_commands {
 
   $self->LOG("MozClient::do_post_co_commands()");
   $self->chdir($work_dir);
-  $self->exec2($self->{'MOZCLIENT_POSTCOCMD'});
+  $self->run_shell($self->{'MOZCLIENT_POSTCOCMD'});
   $self->chdir("..");
 }
 
@@ -285,7 +285,7 @@ sub nobin_cleanup {
   $self->chdir("$work_dir/mozilla");
   my $cmd = sprintf "sh ../../%s > REMOVED+${nobinonly}.txt 2>&1",
     $self->{'MOZCLIENT_EXCLUDE_SCRIPT'};
-  $self->exec2($cmd);
+  $self->run_shell($cmd);
   $self->unlink("REMOVED+${nobinonly}.txt")
     unless -s "REMOVED+${nobinonly}.txt";
   $self->chdir("../..");
@@ -328,7 +328,7 @@ sub pack {
   my $version = $tversion;
   $version .= "+${nobinonly}"
     if -f "$work_dir/mozilla/REMOVED+${nobinonly}.txt";
-  $self->exec("rm -rf $work_dir/" . $self->{'MOZCLIENT_APPNAME'} .
+  $self->run_system("rm -rf $work_dir/" . $self->{'MOZCLIENT_APPNAME'} .
 	      "-$version");
   if ($self->{'MOZCLIENT_EMBEDDED'} || $self->{'MOZCLIENT_WANTMOZDIR'}) {
     $self->mkdir("$work_dir/" . $self->{'MOZCLIENT_APPNAME'} . "-$version",
@@ -339,11 +339,11 @@ sub pack {
     my $cmd = sprintf "tar jcf %s-%s/%s-%s-source.tar.bz2 %s mozilla",
       $self->{'MOZCLIENT_APPNAME'}, $version, $self->{'MOZCLIENT_PROJECT'},
       $tversion, $tar_exclude;
-    $self->exec($cmd);
+    $self->run_system($cmd);
     $self->chdir("..");
   }
   else {
-    $self->exec("mv $work_dir/mozilla $work_dir/" .
+    $self->run_system("mv $work_dir/mozilla $work_dir/" .
 		$self->{'MOZCLIENT_APPNAME'} . "-$version/");
   }
   $self->unlink($self->{'MOZCLIENT_APPNAME'} . "_$version.orig.tar.gz")
@@ -352,10 +352,10 @@ sub pack {
   my $cmd = sprintf "tar zcf ../%s_%s.orig.tar.gz %s %s-%s",
     $self->{'MOZCLIENT_APPNAME'}, $version, $tar_exclude,
     $self->{'MOZCLIENT_APPNAME'}, $version;
-  $self->exec2($cmd);
+  $self->run_shell($cmd);
   $self->chdir("..");
-  $self->exec("rm -rf $work_dir");
-  $self->exec("ls -l " . $self->{'MOZCLIENT_APPNAME'} .
+  $self->run_system("rm -rf $work_dir");
+  $self->run_system("ls -l " . $self->{'MOZCLIENT_APPNAME'} .
 	      "_$version.orig.tar.gz");
 }
 
@@ -374,12 +374,12 @@ sub list_tags {
 
   $self->LOG("MozClient::CVS::list_tags()");
   $self->chdir($work_dir);
-  $self->exec("cvs -d " . $self->{'MOZCLIENT_CVS_LOC'} . " co " .
+  $self->run_system("cvs -d " . $self->{'MOZCLIENT_CVS_LOC'} . " co " .
 	      (join ' ',  @{$self->{'MOZCLIENT_FILE'}}));
   my $file = ${$self->{'MOZCLIENT_FILE'}}[0];
   $file =~ s,^([^/]*)/,,;
   $self->chdir("$1");
-  $self->exec("cvs status -v $file");
+  $self->run_system("cvs status -v $file");
   $self->chdir("../..");
 }
 
@@ -398,7 +398,7 @@ sub do_dynamic_tag {
   undef $self->{'have_date'};
   my $cmd = sprintf "cvs -d %s co %s", $self->{'MOZCLIENT_CVS_LOC'},
     $self->{'MOZCLIENT_DYNTAG_FILES'};
-  $self->exec($cmd);
+  $self->run_system($cmd);
   chomp($self->{'want_tag'} = `$self->{'MOZCLIENT_DYNTAG'}`);
   $self->LOG2("\$ want_tag=`" . $self->{'MOZCLIENT_DYNTAG'} . "` # => " .
 	      $self->{'want_tag'});
@@ -416,15 +416,15 @@ sub get_client {
   my $cmd = sprintf "cvs -d %s co %s %s %s %s", $self->{'MOZCLIENT_CVS_LOC'},
     $tbranch, $self->{'mozclient_date'}, $self->{'co_tag'},
     $self->{'MOZILLA_CLIENT'};
-  $self->exec($cmd);
+  $self->run_system($cmd);
   $self->chdir("..");
 
   if (defined $self->{'MOZCLIENT_WANTPATCH'} &&
       $self->{'MOZCLIENT_WANTPATCH'}) {
-    $self->exec("ln -s " . $self->{'MOZCLIENT_PATCHES'} .
+    $self->run_system("ln -s " . $self->{'MOZCLIENT_PATCHES'} .
 		" $work_dir/patches");
     $self->chdir($work_dir);
-    $self->exec("quilt --quiltrc /dev/null push -a");
+    $self->run_system("quilt --quiltrc /dev/null push -a");
     $self->chdir("..");
   }
 }
@@ -463,13 +463,13 @@ sub checkout {
     my $cmd = sprintf "make -f %s checkout MOZ_CO_PROJECT=%s %s %s",
       $self->{'MOZILLA_CLIENT'}, $self->{'MOZCLIENT_PROJECT'},
       $self->{'mozclient_date'}, $self->{'moz_co_tag'};
-    $self->exec($cmd);
+    $self->run_system($cmd);
   }
   else {
     my $cmd = sprintf "cvs -d %s -q -z 3 co -P -A %s %s %s",
       $self->{'MOZCLIENT_CVS_LOC'}, $self->{'mozclient_date'},
       $self->{'co_tag'}, $self->{'MOZCLIENT_MODULES'};
-    $self->exec($cmd);
+    $self->run_system($cmd);
   }
   $self->chdir("..");
 }
@@ -534,7 +534,7 @@ sub checkout {
   }
   my $cmd = sprintf "hg clone %s %s mozilla", $self->{'mozclient_date'},
     join " ", @$modules;
-  $self->exec($cmd);
+  $self->run_system($cmd);
   $self->chdir("..");
 }