X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_movefiles;h=72cbb0ba38a5457bf56d730e018620c5799c9768;hb=240dc46e8c30caa425156006438af98cce06df84;hp=8762487ac6bd10a4480f10d83dedc87b89792964;hpb=0d919d2978cd12f6a6af3bf00003c38c84fd0a56;p=debhelper.git

diff --git a/dh_movefiles b/dh_movefiles
index 8762487..72cbb0b 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -26,8 +26,8 @@ also list directory names, and the whole directory will be moved. If you
 prefer, you can list the files to move on the command line and this will
 apply to the first package dh_movefiles is told to act on.
 
-Note: dh_install is a much better program that can do everything this one can,
-and more.
+Note: dh_install is a much better program, and you are recommended to use
+it instead of dh_movefiles.
 
 =head1 OPTIONS
 
@@ -37,7 +37,7 @@ and more.
 
 Instead of moving files out of debian/tmp (the default), this option makes
 it move files out of some other directory. Since the entire contents of
-the sourcedir is moved, specifiying something like --sourcedir=/ is very
+the sourcedir is moved, specifying something like --sourcedir=/ is very
 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
 it cannot begin with a `/'.
 
@@ -130,20 +130,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				$ret=1;
 				warning("$file not found (supposed to put it in $package)");
 			}
-			$file=~s:^\Q$sourcedir\E/+::;
-			my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
-			if ($dh{EXCLUDE_FIND}) {
-				$cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+			else {
+				$file=~s:^\Q$sourcedir\E/+::;
+				my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+				if ($dh{EXCLUDE_FIND}) {
+					$cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+				}
+				$cmd.="-print || true) >> debian/movelist";
+				complex_doit($cmd);
 			}
-			$cmd.="-print || true) >> debian/movelist";
-			complex_doit($cmd);
 		}
 		my $pwd=`pwd`;
 		chomp $pwd;
 		complex_doit("(cd $sourcedir >/dev/null ; tar --create --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
 		# --remove-files is not used above because tar then doesn't
 		# preserve hard links
-		complex_doit("cd $sourcedir >/dev/null ; cat $pwd/debian/movelist | xargs rm -f)");
+		complex_doit("(cd $sourcedir >/dev/null ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0  -i rm -f '{}')");
 		doit("rm","-f","debian/movelist");
 	}
 }