X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_archiveStart;h=c527fa46557fe3279242776fb33db42197ef40e3;hp=12553b5a1f5e70489cc84eb373fdb0ed9b45d8db;hb=d1bfa4d92bec24954f2e7877f6531644bb84e8f3;hpb=f076585d3ff9dfe6de32292b897e293008efe74e

diff --git a/bin/BackupPC_archiveStart b/bin/BackupPC_archiveStart
index 12553b5..c527fa4 100755
--- a/bin/BackupPC_archiveStart
+++ b/bin/BackupPC_archiveStart
@@ -1,4 +1,4 @@
-#!/bin/perl
+#!/usr/bin/perl
 #============================================================= -*-perl-*-
 #
 # BackupPC_archiveStart: start an archive request from the
@@ -17,7 +17,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2007  Craig Barratt
+#   Copyright (C) 2007-2009  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
@@ -35,7 +35,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Dec 2008.
+# Version 3.2.0, released 31 Jul 2010.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -54,7 +54,7 @@ my %opts;
 # no options currently
 if ( !getopts("", \%opts) || @ARGV < 3 ) {
     print STDERR <<EOF;
-usage: $0 archiveHost userName hosts...
+usage: $0 archiveHost userName hosts[:num]...
 EOF
     exit(1);
 }
@@ -72,7 +72,7 @@ $bpc->ConfigRead($ArchiveHost);
 
 my(@HostList, @BackupList);
 for ( my $i = 2 ; $i < @ARGV ; $i++ ) {
-    my $host = $ARGV[$i];
+    my ($host,$num) = split(/:/,$ARGV[$i],2);
     if ( !defined($Hosts->{$host}) ) {
         print(STDERR "$0: host $host doesn't exist... quitting\n");
         exit(1);
@@ -83,7 +83,8 @@ for ( my $i = 2 ; $i < @ARGV ; $i++ ) {
         exit(1);
     }
     push(@HostList, $host);
-    push(@BackupList, $backups[$#backups]{num});
+    $num ||= $backups[$#backups]{num};
+    push(@BackupList, $num);
 }
 
 my $ReqFileName;
@@ -94,9 +95,11 @@ for ( my $i = 0 ; ; $i++ ) {
 my %ArchiveReq = (
     archiveloc  => $bpc->{Conf}{ArchiveDest},
     archtype    => 0,
-    compression => $bpc->{Conf}{ArchiveComp} eq "none" ? $bpc->{Conf}{CatPath}
-                                                       : $bpc->{Conf}{ArchiveComp},
-    compext     => $bpc->{Conf}{ArchiveComp} eq "none" ? '.raw' : '.gz',
+    compression => $bpc->{Conf}{ArchiveComp} eq 'none' ? $bpc->{Conf}{CatPath}
+                    : ($bpc->{Conf}{ArchiveComp} eq 'gzip'
+                      ? $bpc->{Conf}{GzipPath} : $bpc->{Conf}{Bzip2Path}),
+    compext     => $bpc->{Conf}{ArchiveComp} eq 'none' ? ''
+                    : ($bpc->{Conf}{ArchiveComp} eq 'gzip' ? '.gz' : '.bz2'),
     parfile     => $bpc->{Conf}{ArchivePar},
     splitsize   => '0000000',
     host        => $ArchiveHost,