- fixed configure.pl and makeDist.

[BackupPC.git] / bin / BackupPC_archiveHost

diff --git a/bin/BackupPC_archiveHost b/bin/BackupPC_archiveHost
index e2ee002..bf9a506 100755 (executable)
--- a/bin/BackupPC_archiveHost
+++ b/bin/BackupPC_archiveHost
@@ -38,7 +38,7 @@
 #
 #========================================================================
 #
 #
 #========================================================================
 #

-# Version 2.1.0beta2, released 23 May 2004.
+# Version 3.0.0alpha, released 23 Jan 2006.

 #
 # See http://backuppc.sourceforge.net.
 #
 #
 # See http://backuppc.sourceforge.net.
 #


@@ -88,6 +88,22 @@ my $mesg = "Writing tar archive for host $host, backup #$bkupNum";
 #
 $share  = $bpc->shellEscape($share);
 $host   = $bpc->shellEscape($host);
 #
 $share  = $bpc->shellEscape($share);
 $host   = $bpc->shellEscape($host);

+
+#
+# We prefer to use /bin/csh because the exit status of a pipeline
+# is non-zero if any command is non zero.  In contrast, /bin/sh
+# and /bin/bash use the convention that the exit status is just
+# the exit status of the last command of the pipeline.
+#
+my @shell;
+if ( -x "/bin/csh" ) {
+    @shell = ("/bin/csh", "-cf");
+} elsif ( -x "/bin/sh" ) {
+    @shell = ("/bin/sh", "-c");
+} else {
+    print("Error: Can't find executable /bin/csh or /bin/sh\n");
+    exit(1);
+}

 my $cmd = "$tarCreate -t -h $host -n $bkupNum -s $share . ";
 $cmd   .= "| $compPath " if ( $compPath ne "cat" && $compPath ne "" );
 if ( -b $outLoc || -c $outLoc || -f $outLoc ) {
 my $cmd = "$tarCreate -t -h $host -n $bkupNum -s $share . ";
 $cmd   .= "| $compPath " if ( $compPath ne "cat" && $compPath ne "" );
 if ( -b $outLoc || -c $outLoc || -f $outLoc ) {


@@ -102,7 +118,7 @@ if ( -b $outLoc || -c $outLoc || -f $outLoc ) {
         print("Error: unable to create output directory $outLoc\n");
         exit(1);
     }
         print("Error: unable to create output directory $outLoc\n");
         exit(1);
     }

-    if ( $splitSize && -x $splitPath ) {
+    if ( $splitSize > 0 && -x $splitPath ) {

         $cmd  .= "| $splitPath -b $splitSize - $outLoc/$host.$bkupNum.tar$fileExt.";
         $mesg .= ", split to output files $outLoc/$host.$bkupNum.tar$fileExt.*";
     } else {
         $cmd  .= "| $splitPath -b $splitSize - $outLoc/$host.$bkupNum.tar$fileExt.";
         $mesg .= ", split to output files $outLoc/$host.$bkupNum.tar$fileExt.*";
     } else {


@@ -115,8 +131,9 @@ print("$mesg\n");
 #
 # Run the command
 #
 #
 # Run the command
 #

-my $ret = system($cmd);
+my $ret = system(@shell, $cmd);

 if ( $ret ) {
 if ( $ret ) {

+    print("Executing: @shell -cf $cmd\n");

     print("Error: $tarCreate, compress or split failed\n");
     exit(1);
 }
     print("Error: $tarCreate, compress or split failed\n");
     exit(1);
 }


@@ -128,8 +145,10 @@ if ( $ret ) {
 if ( -d $outLoc && -x $parPath ) {
     if ( $parfile != 0 ) {
         print("Running $parPath to create parity files\n");
 if ( -d $outLoc && -x $parPath ) {
     if ( $parfile != 0 ) {
         print("Running $parPath to create parity files\n");

-        $ret = system("$parPath c -r$parfile $outLoc/$host.$bkupNum.tar$fileExt.par2 $outLoc/$host.$bkupNum.tar$fileExt.*");
+       my $parCmd = "$parPath c -r$parfile $outLoc/$host.$bkupNum.tar$fileExt.par2 $outLoc/$host.$bkupNum.tar$fileExt*";
+        $ret = system($parCmd);

         if ( $ret ) {
         if ( $ret ) {

+           print("Executing: $parCmd\n");

             print("Error: $parPath failed\n");
             exit(1);
         }
             print("Error: $parPath failed\n");
             exit(1);
         }