X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=configure.pl;h=8c9c3610cf441defbbdb82f0767dbbe7beeed594;hp=262e7b38a58242abe17737f01b42a62062465e92;hb=d5fa3b7c692c93f843a6154866ebd9ea8293302e;hpb=b6e98cb4e11dcc0d73163ee57509aeec2b6013d3 diff --git a/configure.pl b/configure.pl index 262e7b3..8c9c361 100755 --- a/configure.pl +++ b/configure.pl @@ -40,6 +40,7 @@ #======================================================================== use strict; +no utf8; use vars qw(%Conf %OrigConf); use lib "./lib"; @@ -99,11 +100,11 @@ my $bpc; if ( $ConfigPath ne "" && -r $ConfigPath ) { (my $topDir = $ConfigPath) =~ s{/[^/]+/[^/]+$}{}; die("BackupPC::Lib->new failed\n") - if ( !($bpc = BackupPC::Lib->new($topDir, ".")) ); + if ( !($bpc = BackupPC::Lib->new($topDir, ".", 1)) ); %Conf = $bpc->Conf(); %OrigConf = %Conf; $Conf{TopDir} = $topDir; - my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1); + my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1); if ( $err eq "" ) { print < "SshPath", sendmail => "SendmailPath", hostname => "HostnamePath", + split => "SplitPath", + 'parchive/par' => "ParPath", + cat => "CatPath", + gzip => "GzipPath", + bzip2 => "Bzip2Path", ); foreach my $prog ( sort(keys(%Programs)) ) { @@ -148,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); @@ -359,8 +365,12 @@ exit unless prompt("--> Do you want to continue?", "y") =~ /y/i; # # Create install directories # -foreach my $dir ( qw(bin lib/BackupPC/Xfer lib/BackupPC/Zip - lib/BackupPC/Lang doc) ) { +foreach my $dir ( qw(bin doc + lib/BackupPC/CGI + lib/BackupPC/Lang + lib/BackupPC/Xfer + lib/BackupPC/Zip + ) ) { next if ( -d "$Conf{InstallDir}/$dir" ); mkpath("$Conf{InstallDir}/$dir", 0, 0775); if ( !-d "$Conf{InstallDir}/$dir" @@ -401,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); } @@ -411,11 +422,42 @@ foreach my $prog ( qw(BackupPC BackupPC_dump BackupPC_link BackupPC_nightly unlink("$Conf{InstallDir}/bin/BackupPC_queueAll"); printf("Installing library in $Conf{InstallDir}/lib\n"); -foreach my $lib ( qw(BackupPC/Lib.pm BackupPC/FileZIO.pm BackupPC/Attrib.pm - BackupPC/PoolWrite.pm BackupPC/View.pm BackupPC/Xfer/Tar.pm - BackupPC/Xfer/Smb.pm BackupPC/Xfer/Rsync.pm - BackupPC/Xfer/RsyncFileIO.pm BackupPC/Zip/FileMember.pm - BackupPC/Lang/en.pm BackupPC/Lang/fr.pm BackupPC/Lang/es.pm +foreach my $lib ( qw( + BackupPC/Lib.pm + BackupPC/FileZIO.pm + 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 + BackupPC/Xfer/RsyncFileIO.pm + BackupPC/Zip/FileMember.pm + BackupPC/Lang/en.pm + 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 + BackupPC/CGI/GeneralInfo.pm + BackupPC/CGI/HostInfo.pm + 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 ) ) { InstallFile("lib/$lib", "$Conf{InstallDir}/lib/$lib", 0444); } @@ -429,7 +471,8 @@ if ( $Conf{CgiImageDir} ne "" ) { } printf("Making init.d scripts\n"); -foreach my $init ( qw(linux-backuppc solaris-backuppc debian-backuppc) ) { +foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc + solaris-backuppc debian-backuppc suse-backuppc) ) { InstallFile("init.d/src/$init", "init.d/$init", 0444); } @@ -542,7 +585,8 @@ if ( -f $dest && !-f $confCopy ) { unless chown($uid, $gid, $confCopy); die("can't chmod $mode $confCopy\n") unless chmod($mode, $confCopy); } -open(OUT, ">$dest") || die("can't open $dest for writing\n"); +open(OUT, ">", $dest) || die("can't open $dest for writing\n"); +binmode(OUT); my $blockComment; foreach my $var ( @$newConf ) { if ( length($blockComment) @@ -592,11 +636,27 @@ 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 +if ( $ENV{LANG} =~ /utf/i && $^V ge v5.8.0 ) { + print <$dest") || die("can't open $dest for writing\n"); + open(PROG, $prog) || die("can't open $prog for reading\n"); + open(OUT, ">", $dest) || die("can't open $dest for writing\n"); + binmode(PROG); + binmode(OUT); while ( ) { s/__INSTALLDIR__/$Conf{InstallDir}/g; s/__TOPDIR__/$Conf{TopDir}/g; @@ -665,11 +727,13 @@ sub ConfigParse { my($file) = @_; open(C, $file) || die("can't open $file"); + binmode(C); my($out, @conf, $var); my $comment = 1; my $allVars = {}; + my $endLine = undef; while ( ) { - if ( /^#/ ) { + if ( /^#/ && !defined($endLine) ) { if ( $comment ) { $out .= $_; } else { @@ -697,7 +761,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 .= $_; } }