#
# AUTHOR
# Craig Barratt <cbarratt@users.sourceforge.net>
+# Josh Marshall
#
# COPYRIGHT
-# Copyright (C) 2001-2003 Craig Barratt
+# Copyright (C) 2001-2007 Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
#========================================================================
#
-# Version 2.1.0beta0, released 20 Mar 2004.
+# Version 3.1.0beta0, released 3 Sep 2007.
#
# See http://backuppc.sourceforge.net.
#
#
$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 "" );
+$cmd .= "| $compPath " if ( $compPath ne "cat"
+ && $compPath ne "/bin/cat
+ && $compPath ne "" );
if ( -b $outLoc || -c $outLoc || -f $outLoc ) {
#
# Output file is a device or a regular file, so don't use split
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 {
#
# Run the command
#
-my $ret = system($cmd);
+my $ret = system(@shell, $cmd);
if ( $ret ) {
+ print("Executing: @shell $cmd\n");
print("Error: $tarCreate, compress or split failed\n");
exit(1);
}
# ie: not a tape device).
#
if ( -d $outLoc && -x $parPath ) {
- print("Running $parPath to create parity files\n");
- $ret = system("$parPath a -n $parfile $outLoc/$host.$bkupNum.tar$fileExt.par $outLoc/$host.$bkupNum.tar$fileExt.*");
- if ( $ret ) {
- print("Error: $parPath failed\n");
- exit(1);
+ if ( $parfile != 0 ) {
+ print("Running $parPath to create parity files\n");
+ my $parCmd = "$parPath c -r$parfile $outLoc/$host.$bkupNum.tar$fileExt.par2 $outLoc/$host.$bkupNum.tar$fileExt*";
+ $ret = system($parCmd);
+ if ( $ret ) {
+ print("Executing: $parCmd\n");
+ print("Error: $parPath failed\n");
+ exit(1);
+ }
}
}