* removed Host_or_User_name from lang files

[BackupPC.git] / configure.pl

diff --git a/configure.pl b/configure.pl
index 0abc9a7..0ca5862 100755 (executable)
--- a/configure.pl
+++ b/configure.pl
@@ -121,16 +121,21 @@ EOF
 # These are the programs whose paths we need to find
 #
 my %Programs = (
-    perl       => "PerlPath",
-    'gtar/tar' => "TarClientPath",
-    smbclient  => "SmbClientPath",
-    nmblookup  => "NmbLookupPath",
-    rsync      => "RsyncClientPath",
-    ping       => "PingPath",
-    df         => "DfPath",
-    'ssh/ssh2' => "SshPath",
-    sendmail   => "SendmailPath",
-    hostname   => "HostnamePath",
+    perl           => "PerlPath",
+    'gtar/tar'     => "TarClientPath",
+    smbclient      => "SmbClientPath",
+    nmblookup      => "NmbLookupPath",
+    rsync          => "RsyncClientPath",
+    ping           => "PingPath",
+    df             => "DfPath",
+    'ssh/ssh2'     => "SshPath",
+    sendmail       => "SendmailPath",
+    hostname       => "HostnamePath",
+    split          => "SplitPath",
+    'parchive/par' => "ParPath",
+    cat            => "CatPath",
+    gzip           => "GzipPath",
+    bzip2          => "Bzip2Path",
 );
 
 foreach my $prog ( sort(keys(%Programs)) ) {
@@ -149,7 +154,7 @@ I found the following locations for these programs:
 
 EOF
     foreach my $prog ( sort(keys(%Programs)) ) {
-        printf("    %-11s => %s\n", $prog, $Conf{$Programs{$prog}});
+        printf("    %-12s => %s\n", $prog, $Conf{$Programs{$prog}});
     }
     print "\n";
     last if (prompt('--> Are these paths correct?', 'y') =~ /^y/i);
@@ -406,6 +411,7 @@ printf("Installing binaries in $Conf{InstallDir}/bin\n");
 foreach my $prog ( qw(BackupPC BackupPC_dump BackupPC_link BackupPC_nightly
         BackupPC_sendEmail BackupPC_tarCreate BackupPC_trashClean
         BackupPC_tarExtract BackupPC_compressPool BackupPC_zcat
+        BackupPC_archive BackupPC_archivecd BackupPC_archivetape 
         BackupPC_restore BackupPC_serverMesg BackupPC_zipCreate ) ) {
     InstallFile("bin/$prog", "$Conf{InstallDir}/bin/$prog", 0555);
 }
@@ -422,6 +428,7 @@ foreach my $lib ( qw(
        BackupPC/Attrib.pm
         BackupPC/PoolWrite.pm
        BackupPC/View.pm
+       BackupPC/Xfer/Archive.pm
        BackupPC/Xfer/Tar.pm
         BackupPC/Xfer/Smb.pm
        BackupPC/Xfer/Rsync.pm
@@ -431,6 +438,9 @@ foreach my $lib ( qw(
        BackupPC/Lang/fr.pm
        BackupPC/Lang/es.pm
         BackupPC/Lang/de.pm
+        BackupPC/CGI/AdminOptions.pm
+       BackupPC/CGI/Archive.pm
+       BackupPC/CGI/ArchiveInfo.pm
        BackupPC/CGI/Browse.pm
        BackupPC/CGI/DirHistory.pm
        BackupPC/CGI/EmailSummary.pm
@@ -439,10 +449,13 @@ foreach my $lib ( qw(
        BackupPC/CGI/Lib.pm
        BackupPC/CGI/LOGlist.pm
        BackupPC/CGI/Queue.pm
+        BackupPC/CGI/ReloadServer.pm
        BackupPC/CGI/RestoreFile.pm
        BackupPC/CGI/RestoreInfo.pm
        BackupPC/CGI/Restore.pm
+        BackupPC/CGI/StartServer.pm
        BackupPC/CGI/StartStopBackup.pm
+        BackupPC/CGI/StopServer.pm
        BackupPC/CGI/Summary.pm
        BackupPC/CGI/View.pm
     ) ) {
@@ -532,7 +545,7 @@ if ( defined($Conf{PingArgs}) ) {
     if ( $^O eq "solaris" || $^O eq "sunos" ) {
        $Conf{PingCmd} = '$pingPath -s $host 56 1';
     } elsif ( ($^O eq "linux" || $^O eq "openbsd" || $^O eq "netbsd")
-           && !system("$Conf{PingClientPath} -c 1 -w 3 localhost") ) {
+           && !system("$Conf{PingPath} -c 1 -w 3 localhost") ) {
        $Conf{PingCmd} = '$pingPath -c 1 -w 3 $host';
     } else {
        $Conf{PingCmd} = '$pingPath -c 1 $host';
@@ -623,7 +636,9 @@ will need to do:
   - BackupPC should be ready to start.  Don't forget to run it
     as user $Conf{BackupPCUser}!  The installation also contains an
     init.d/backuppc script that can be copied to /etc/init.d
-    so that BackupPC can auto-start on boot.  See init.d/README.
+    so that BackupPC can auto-start on boot.  This will also enable
+    administrative users to start the server from the CGI interface.
+    See init.d/README.
 
 Enjoy!
 EOF
@@ -675,18 +690,10 @@ sub InstallFile
            s/__BACKUPPCUSER__/$Conf{BackupPCUser}/g;
            s/__CGIDIR__/$Conf{CgiDir}/g;
            if ( $first && /^#.*bin\/perl/ ) {
-               if ( $Perl56 ) {
-                   #
-                   # perl56 and later is taint ok
-                   #
-                   print OUT "#!$Conf{PerlPath} -T\n";
-               } else {
-                   #
-                   # prior to perl56, File::Find fails taint checks,
-                   # so we run without -T.  It's still safe.
-                   #
-                   print OUT "#!$Conf{PerlPath}\n";
-               }
+               #
+               # Fill in correct path to perl (no taint for >= 2.1.0).
+               #
+               print OUT "#!$Conf{PerlPath}\n";
            } else {
                print OUT;
            }
@@ -716,8 +723,9 @@ sub ConfigParse
     my($out, @conf, $var);
     my $comment = 1;
     my $allVars = {};
+    my $endLine = undef;
     while ( <C> ) {
-        if ( /^#/ ) {
+        if ( /^#/ && !defined($endLine) ) {
             if ( $comment ) {
                 $out .= $_;
             } else {
@@ -745,7 +753,10 @@ sub ConfigParse
                 $out .= $_;
             }
             $var = $1;
+           $endLine = $1 if ( /^\s*\$Conf\{[^}]*} *= *<<(.*);/ );
+           $endLine = $1 if ( /^\s*\$Conf\{[^}]*} *= *<<'(.*)';/ );
         } else {
+           $endLine = undef if ( defined($endLine) && /^\Q$endLine[\n\r]*$/ );
             $out .= $_;
         }
     }