From 65bd49aab50fd717431b8880e9c34dc3ce11ee97 Mon Sep 17 00:00:00 2001
From: joeyh <joeyh@19660600-52fe-0310-9875-adc0d7a7b53c>
Date: Tue, 2 Oct 2007 20:19:40 +0000
Subject: [PATCH] improve some doit calls

---
 pristine-gz  |  4 ++--
 pristine-tar | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pristine-gz b/pristine-gz
index 3369e2c..a6b2908 100755
--- a/pristine-gz
+++ b/pristine-gz
@@ -346,8 +346,8 @@ sub gengz {
 	utime($timestamp, $timestamp, "$tempdir/$filename") ||
 		die "utime: $!";
 	doit("zgz", @params, "-f", "$tempdir/$filename");
-	doit("mv", "$tempdir/$filename.gz", "$file.gz");
-	doit("rm", "-f", "$tempdir/$filename.gz", $file);
+	doit("mv", "-f", "$tempdir/$filename.gz", "$file.gz");
+	doit("rm", "-f", $file);
 }
 
 sub gendelta {
diff --git a/pristine-tar b/pristine-tar
index bba15e3..bd57747 100755
--- a/pristine-tar
+++ b/pristine-tar
@@ -94,7 +94,7 @@ sub gentarball {
 	my $source=shift;
 	my $clobber_source=shift;
 	
-	doit("mkdir $tempdir/workdir");
+	doit("mkdir", "$tempdir/workdir");
 
 	my @manifest;
 	open (IN, "$tempdir/manifest") || die "$tempdir/manifest: $!";
@@ -121,10 +121,10 @@ sub gentarball {
 	}
 	
 	if (! $clobber_source) {
-		doit("cp -a $source $tempdir/workdir/$subdir");
+		doit("cp", "-a", $source, "$tempdir/workdir/$subdir");
 	}
 	else {
-		doit("mv $source $tempdir/workdir/$subdir");
+		doit("mv", $source, "$tempdir/workdir/$subdir");
 	}
 
 	# It's important that this create an identical tarball each time
@@ -183,7 +183,7 @@ sub gentar {
 			($verbose ? "-v" : "--no-verbose"),
 			($debug ? "-d" : "--no-debug"),
 			"gengz", "$tempdir/wrapper", $out);
-		doit("mv", $out.".gz", $tarball);
+		doit("mv", "-f", $out.".gz", $tarball);
 	}
 }
 
@@ -212,7 +212,7 @@ sub gendelta {
 	close IN;
 	
 	my $sourcedir="$tempdir/tmp";
-	doit("mkdir $sourcedir");
+	doit("mkdir", $sourcedir);
 	doit("tar", "xf", File::Spec->rel2abs($tarball), "-C", $sourcedir);
 	# if all files were in a subdir, use the subdir as the sourcedir
 	my @out=grep { $_ ne "$sourcedir/.." && $_ ne "$sourcedir/." }
-- 
2.7.4