projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Support for rsync and rsyncd. Changes to BackupPC_dump and new
[BackupPC.git]
/
configure.pl
diff --git
a/configure.pl
b/configure.pl
index
c78e7a3
..
b7a427a
100755
(executable)
--- a/
configure.pl
+++ b/
configure.pl
@@
-33,7
+33,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version
1.5.0, released 2 Aug 2002
.
+# Version
__VERSION__, released __RELEASEDATE__
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-90,7
+90,7
@@
while ( 1 ) {
last if ( $ConfigPath eq ""
|| ($ConfigPath =~ /^\// && -r $ConfigPath && -w $ConfigPath) );
my $problem = "is not an absolute path";
last if ( $ConfigPath eq ""
|| ($ConfigPath =~ /^\// && -r $ConfigPath && -w $ConfigPath) );
my $problem = "is not an absolute path";
- $problem = "is no
writable"
if ( !-w $ConfigPath );
+ $problem = "is no
t writable"
if ( !-w $ConfigPath );
$problem = "is not readable" if ( !-r $ConfigPath );
$problem = "doesn't exist" if ( !-f $ConfigPath );
print("The file '$ConfigPath' $problem.\n");
$problem = "is not readable" if ( !-r $ConfigPath );
$problem = "doesn't exist" if ( !-f $ConfigPath );
print("The file '$ConfigPath' $problem.\n");
@@
-99,7
+99,7
@@
my $bpc;
if ( $ConfigPath ne "" && -r $ConfigPath ) {
(my $topDir = $ConfigPath) =~ s{/[^/]+/[^/]+$}{};
die("BackupPC::Lib->new failed\n")
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
, "."
)) );
%Conf = $bpc->Conf();
%OrigConf = %Conf;
$Conf{TopDir} = $topDir;
%Conf = $bpc->Conf();
%OrigConf = %Conf;
$Conf{TopDir} = $topDir;
@@
-124,6
+124,7
@@
my %Programs = (
'gtar/tar' => "TarClientPath",
smbclient => "SmbClientPath",
nmblookup => "NmbLookupPath",
'gtar/tar' => "TarClientPath",
smbclient => "SmbClientPath",
nmblookup => "NmbLookupPath",
+ rsync => "RsyncClientPath",
ping => "PingPath",
df => "DfPath",
'ssh2/ssh' => "SshPath",
ping => "PingPath",
df => "DfPath",
'ssh2/ssh' => "SshPath",
@@
-327,6
+328,8
@@
needs to know the URL to access these images. Example:
Apache image directory: /usr/local/apache/htdocs/BackupPC
URL for image directory: /BackupPC
Apache image directory: /usr/local/apache/htdocs/BackupPC
URL for image directory: /BackupPC
+The URL for the image directory should start with a slash.
+
EOF
while ( 1 ) {
$Conf{CgiImageDir} = prompt("--> Apache image directory (full path)",
EOF
while ( 1 ) {
$Conf{CgiImageDir} = prompt("--> Apache image directory (full path)",
@@
-334,9
+337,9
@@
EOF
last if ( $Conf{CgiImageDir} =~ /^\// );
}
while ( 1 ) {
last if ( $Conf{CgiImageDir} =~ /^\// );
}
while ( 1 ) {
- $Conf{CgiImageDirURL} = prompt("--> URL for image directory (omit http://host)",
+ $Conf{CgiImageDirURL} = prompt("--> URL for image directory (omit http://host
; starts with '/'
)",
$Conf{CgiImageDirURL});
$Conf{CgiImageDirURL});
- last if ( $Conf{CgiImageDirURL}
ne ""
);
+ last if ( $Conf{CgiImageDirURL}
=~ /^\//
);
}
}
}
}
@@
-356,7
+359,8
@@
exit unless prompt("--> Do you want to continue?", "y") =~ /y/i;
#
# Create install directories
#
#
# Create install directories
#
-foreach my $dir ( qw(bin lib/BackupPC/Xfer lib/BackupPC/Zip doc) ) {
+foreach my $dir ( qw(bin lib/BackupPC/Xfer lib/BackupPC/Zip
+ lib/BackupPC/Lang doc) ) {
next if ( -d "$Conf{InstallDir}/$dir" );
mkpath("$Conf{InstallDir}/$dir", 0, 0775);
if ( !-d "$Conf{InstallDir}/$dir"
next if ( -d "$Conf{InstallDir}/$dir" );
mkpath("$Conf{InstallDir}/$dir", 0, 0775);
if ( !-d "$Conf{InstallDir}/$dir"
@@
-408,8
+412,11
@@
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
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/Xfer/Tar.pm BackupPC/Xfer/Smb.pm
- BackupPC/Zip/FileMember.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
+ ) ) {
InstallFile("lib/$lib", "$Conf{InstallDir}/lib/$lib", 0444);
}
InstallFile("lib/$lib", "$Conf{InstallDir}/lib/$lib", 0444);
}
@@
-422,7
+429,7
@@
if ( $Conf{CgiImageDir} ne "" ) {
}
printf("Making init.d scripts\n");
}
printf("Making init.d scripts\n");
-foreach my $init ( qw(linux-backuppc solaris-backuppc) ) {
+foreach my $init ( qw(linux-backuppc solaris-backuppc
debian-backuppc
) ) {
InstallFile("init.d/src/$init", "init.d/$init", 0444);
}
InstallFile("init.d/src/$init", "init.d/$init", 0444);
}
@@
-458,13
+465,14
@@
$Conf{IncrFill} = 0;
#
if ( $^O eq "solaris" || $^O eq "sunos" ) {
$Conf{PingArgs} ||= '-s $host 56 1';
#
if ( $^O eq "solaris" || $^O eq "sunos" ) {
$Conf{PingArgs} ||= '-s $host 56 1';
-} elsif ( $^O eq "linux" || $^O eq "openbsd" || $^O eq "netbsd" ) {
+} elsif ( ($^O eq "linux" || $^O eq "openbsd" || $^O eq "netbsd")
+ && !system("$Conf{PingClientPath} -c 1 -w 3 localhost") ) {
$Conf{PingArgs} ||= '-c 1 -w 3 $host';
} else {
$Conf{PingArgs} ||= '-c 1 $host';
}
$Conf{PingArgs} ||= '-c 1 -w 3 $host';
} else {
$Conf{PingArgs} ||= '-c 1 $host';
}
-my $confCopy = "$dest.pre-
1.4.0.b1
";
+my $confCopy = "$dest.pre-
__VERSION__
";
if ( -f $dest && !-f $confCopy ) {
#
# Make copy of config file, preserving ownership and modes
if ( -f $dest && !-f $confCopy ) {
#
# Make copy of config file, preserving ownership and modes