projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* added pl.pm
[BackupPC.git]
/
configure.pl
diff --git
a/configure.pl
b/configure.pl
index
433a016
..
7ec545c
100755
(executable)
--- a/
configure.pl
+++ b/
configure.pl
@@
-19,7
+19,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001-200
6
Craig Barratt
+# Copyright (C) 2001-200
7
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
#
# 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
@@
-37,7
+37,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 3.
0.0alpha, released 8 Jul 2006
.
+# Version 3.
1.0beta0, released 3 Sep 2007
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-47,6
+47,15
@@
use strict;
no utf8;
use vars qw(%Conf %OrigConf);
use lib "./lib";
no utf8;
use vars qw(%Conf %OrigConf);
use lib "./lib";
+use Encode;
+
+my $EncodeVersion = eval($Encode::VERSION);
+if ( $EncodeVersion < 1.99 ) {
+ print("Error: you need to upgrade perl's Encode package.\n"
+ . "I found $EncodeVersion and BackupPC needs >= 1.99\n"
+ . "Please go to www.cpan.org or use the cpan command.\n");
+ exit(1);
+}
my @Packages = qw(File::Path File::Spec File::Copy DirHandle Digest::MD5
Data::Dumper Getopt::Std Getopt::Long Pod::Usage
my @Packages = qw(File::Path File::Spec File::Copy DirHandle Digest::MD5
Data::Dumper Getopt::Std Getopt::Long Pod::Usage
@@
-58,7
+67,8
@@
foreach my $pkg ( @Packages ) {
if ( $pkg =~ /BackupPC/ ) {
die <<EOF;
if ( $pkg =~ /BackupPC/ ) {
die <<EOF;
-BackupPC cannot find the package $pkg, which is included in the
+Error loading $pkg: $@
+BackupPC cannot load the package $pkg, which is included in the
BackupPC distribution. This probably means you did not cd to the
unpacked BackupPC distribution before running configure.pl, eg:
BackupPC distribution. This probably means you did not cd to the
unpacked BackupPC distribution before running configure.pl, eg:
@@
-273,13
+283,13
@@
EOF
}
}
}
}
-my $Perl5
6
= system($Conf{PerlPath}
- . q{ -e 'exit($^V && $^V ge v5.
6
.0 ? 1 : 0);'});
+my $Perl5
8
= system($Conf{PerlPath}
+ . q{ -e 'exit($^V && $^V ge v5.
8
.0 ? 1 : 0);'});
-if ( !$Perl5
6
) {
+if ( !$Perl5
8
) {
print <<EOF;
print <<EOF;
-BackupPC needs perl version 5.
6
.0 or later. $Conf{PerlPath} appears
+BackupPC needs perl version 5.
8
.0 or later. $Conf{PerlPath} appears
to be an older version. Please upgrade to a newer version of perl
and re-run this configure script.
to be an older version. Please upgrade to a newer version of perl
and re-run this configure script.
@@
-325,6
+335,8
@@
check the name and verify that this user is in the passwd file.
EOF
exit(1) if ( $opts{batch} );
EOF
exit(1) if ( $opts{batch} );
+ } else {
+ last;
}
}
}
}
@@
-348,10
+360,10
@@
while ( 1 ) {
print <<EOF;
print <<EOF;
-Please specify a data directory for BackupPC. This is where the
-all the PC backup data is stored. This file system needs to be
-big enough to accommodate all the PCs you expect to backup (eg:
-
at least several GB
per machine).
+Please specify a data directory for BackupPC. This is where
all
the
+PC backup data is stored. This file system needs to be big enough to
+accommodate all the PCs you expect to backup (eg: at least several GB
+per machine).
EOF
EOF
@@
-462,7
+474,7
@@
if ( $Conf{CgiDir} ne "" ) {
BackupPC's CGI script needs to display various GIF images that
should be stored where Apache can serve them. They should be
BackupPC's CGI script needs to display various GIF images that
should be stored where Apache can serve them. They should be
-placed somewher under Apache's DocumentRoot. BackupPC also
+placed somewher
e
under Apache's DocumentRoot. BackupPC also
needs to know the URL to access these images. Example:
Apache image directory: /usr/local/apache/htdocs/BackupPC
needs to know the URL to access these images. Example:
Apache image directory: /usr/local/apache/htdocs/BackupPC
@@
-531,7
+543,7
@@
foreach my $dir ( qw(bin doc
# Create CGI image directory
#
foreach my $dir ( ($Conf{CgiImageDir}) ) {
# Create CGI image directory
#
foreach my $dir ( ($Conf{CgiImageDir}) ) {
- next if ( $dir eq "" || -d
$dir
);
+ next if ( $dir eq "" || -d
"$DestDir$dir"
);
mkpath("$DestDir$dir", 0, 0755);
if ( !-d "$DestDir$dir" || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
die("Failed to create or chown $DestDir$dir");
mkpath("$DestDir$dir", 0, 0755);
if ( !-d "$DestDir$dir" || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
die("Failed to create or chown $DestDir$dir");
@@
-591,12
+603,16
@@
if ( $Conf{CgiImageDir} ne "" ) {
}
InstallFile("conf/BackupPC_stnd.css",
"$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", 0444, 0);
}
InstallFile("conf/BackupPC_stnd.css",
"$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", 0444, 0);
+ InstallFile("conf/BackupPC_stnd_orig.css",
+ "$DestDir$Conf{CgiImageDir}/BackupPC_stnd_orig.css", 0444, 0);
+ InstallFile("conf/sorttable.js",
+ "$DestDir$Conf{CgiImageDir}/sorttable.js", 0444, 0);
}
printf("Making init.d scripts\n");
foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc
}
printf("Making init.d scripts\n");
foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc
- solaris-backuppc debian-backuppc
suse
-backuppc
- slackware-backuppc ) ) {
+ solaris-backuppc debian-backuppc
freebsd
-backuppc
+
suse-backuppc
slackware-backuppc ) ) {
InstallFile("init.d/src/$init", "init.d/$init", 0444);
}
InstallFile("init.d/src/$init", "init.d/$init", 0444);
}
@@
-697,6
+713,13
@@
$Conf{CgiNavBarAdminAllHosts} = 1;
#
$Conf{IncrFill} = 0;
#
$Conf{IncrFill} = 0;
+#
+# Empty $Conf{ParPath} if it isn't a valid executable
+# (pre-3.0.0 configure.pl incorrectly set it to a
+# hardcoded value).
+#
+$Conf{ParPath} = '' if ( $Conf{ParPath} ne '' && !-x $Conf{ParPath} );
+
#
# Figure out sensible arguments for the ping command
#
#
# Figure out sensible arguments for the ping command
#
@@
-836,6
+859,8
@@
will need to do:
- Verify that the CGI script BackupPC_Admin runs correctly. You might
need to change the permissions or group ownership of BackupPC_Admin.
- Verify that the CGI script BackupPC_Admin runs correctly. You might
need to change the permissions or group ownership of BackupPC_Admin.
+ If this is an upgrade and you are using mod_perl, you will need
+ to restart Apache. Otherwise it will have stale code.
- BackupPC should be ready to start. Don't forget to run it
as user $Conf{BackupPCUser}! The installation also contains an
- BackupPC should be ready to start. Don't forget to run it
as user $Conf{BackupPCUser}! The installation also contains an
@@
-862,9
+887,9
@@
EOF
}
eval "use File::RsyncP;";
}
eval "use File::RsyncP;";
-if ( !$@ && $File::RsyncP::VERSION < 0.6
4
) {
+if ( !$@ && $File::RsyncP::VERSION < 0.6
8
) {
print("\nWarning: you need to upgrade File::RsyncP;"
print("\nWarning: you need to upgrade File::RsyncP;"
- . " I found $File::RsyncP::VERSION and BackupPC needs 0.6
4
\n");
+ . " I found $File::RsyncP::VERSION and BackupPC needs 0.6
8
\n");
}
exit(0);
}
exit(0);
@@
-1166,7
+1191,7
@@
final locations.
Use locations specified by the Filesystem Hierarchy Standard
for installing BackupPC. This is enabled by default for new
Use locations specified by the Filesystem Hierarchy Standard
for installing BackupPC. This is enabled by default for new
-installatios. To use the pre-3.0 installation locations,
+installatio
n
s. To use the pre-3.0 installation locations,
specify --no-fhs.
=item B<--help|?>
specify --no-fhs.
=item B<--help|?>
@@
-1261,7
+1286,7
@@
Craig Barratt <cbarratt@users.sourceforge.net>
=head1 COPYRIGHT
=head1 COPYRIGHT
-Copyright (C) 2001-200
6
Craig Barratt.
+Copyright (C) 2001-200
7
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
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