backup: Fixes in the restore script

backup-tar/restore.pl

@@ -7,12 +7,6 @@ use File::Spec::Functions ( "catfile", "catdir", "file_name_is_absolute", "split
 use Scalar::Util ( "tainted" );
 
 $ENV{PATH} = "/usr/local/bin:/usr/bin:/bin";
-my $thrs = 1;
-if ( `nproc` =~ /^([0-9])$/ ) {
-    $thrs = int( $1 / 4 );
-    $thrs = 1 if $thrs <= 0;
-    $thrs = 8 if $thrs > 8;
-}
 
 sub usage {
     my ( $stream ) = @_;
@@ -43,7 +37,8 @@ if ( (shift @ARGV) =~ /([0-9]+-[0-9]+-[0-9]+)/ ) {
 }
 my @paths = ();
 for my $p ( @ARGV ) {
-    if ( $p =~ m|^(/.*)$| ) {
+	# strip the leading / to match paths in the tar
+    if ( $p =~ m|^/(.*)$| ) {
         push( @paths, $1 );
     } else {
         print STDERR "Expected absolute path but got $p\n";
@@ -84,8 +79,8 @@ for my $backup ( @backups ) {
 my @to_restore = ( $full, @weekly, @daily );
 
 for my $backup ( @to_restore ) {
-    print $backup . ": " .  tainted( $backup ) . "\n";
-    system( "tar", "--extract", "--auto-compress", "--incremental", "--xattrs",
-            "--acls", "-vv", "-T$thrs", "-f$backup", "--", @paths ) == 0
-        or die "extract of $backup failed $?";
+    print "$backup…\n";
+    my @args = ( "tar", "--extract", "--auto-compress", "--incremental", "--xattrs",
+				 "--acls", "-vv", "-f$backup", "--", @paths );
+	system( @args ) == 0 or die "extract of $backup failed with $?, @args\n";
 }