X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=configure.pl;h=09d99b7777041f8741d44bc3bda383f3874c3951;hp=a48ffc6a9dfbb0500591ce850847d75e67e18974;hb=b4370280795843df0d024346e5632bfd00aff89e;hpb=d6dd48e6594d937dea49e3dd1c5ddaba6719df0d

diff --git a/configure.pl b/configure.pl
index a48ffc6..09d99b7 100755
--- a/configure.pl
+++ b/configure.pl
@@ -132,7 +132,7 @@ my %Programs = (
     sendmail       => "SendmailPath",
     hostname       => "HostnamePath",
     split          => "SplitPath",
-    'parchive/par' => "ParPath",
+    par2           => "ParPath",
     cat            => "CatPath",
     gzip           => "GzipPath",
     bzip2          => "Bzip2Path",
@@ -470,6 +470,16 @@ if ( $Conf{CgiImageDir} ne "" ) {
 	(my $destImg = $img) =~ s{^images/}{};
 	InstallFile($img, "$Conf{CgiImageDir}/$destImg", 0444, 1);
     }
+
+    #
+    # Install new CSS file, making a backup copy if necessary
+    #
+    my $cssBackup = "$Conf{CgiImageDir}/BackupPC_stnd.css.pre-__VERSION__";
+    if ( -f "$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {
+	rename("$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);
+    }
+    InstallFile("conf/BackupPC_stnd.css",
+	        "$Conf{CgiImageDir}/BackupPC_stnd.css", 0444, 0);
 }
 
 printf("Making init.d scripts\n");
@@ -533,6 +543,11 @@ if ( defined($Conf{SmbClientArgs}) ) {
     delete($Conf{SmbClientArgs});
 }
 
+#
+# CSS is now stored in a file rather than a big config variable.
+#
+delete($Conf{CSSstylesheet});
+
 #
 # The blackout timing settings are now stored in a list of hashes, rather
 # than three scalar parameters.
@@ -553,7 +568,15 @@ if ( defined($Conf{BlackoutHourBegin}) ) {
 #
 # $Conf{RsyncLogLevel} has been replaced by $Conf{XferLogLevel}
 #
-$Conf{XferLogLevel} = $Conf{RsyncLogLevel};
+if ( defined($Conf{RsyncLogLevel}) ) {
+    $Conf{XferLogLevel} = $Conf{RsyncLogLevel};
+    delete($Conf{RsyncLogLevel});
+}
+
+#
+# In 2.1.0 the default for $Conf{CgiNavBarAdminAllHosts} is now 1
+#
+$Conf{CgiNavBarAdminAllHosts} = 1;
 
 #
 # IncrFill should now be off
@@ -670,7 +693,7 @@ EOF
 if ( `$Conf{PerlPath} -V` =~ /uselargefiles=undef/ ) {
     print <<EOF;
 
-WARNING: your perl, $Conf{PerlPath}, does not support large files.
+Warning: your perl, $Conf{PerlPath}, does not support large files.
 This means BackupPC won't be able to backup files larger than 2GB.
 To solve this problem you should build/install a new version of perl
 with large file support enabled.  Use
@@ -678,10 +701,15 @@ with large file support enabled.  Use
     $Conf{PerlPath} -V | egrep uselargefiles
 
 to check if perl has large file support (undef means no support).
-
 EOF
 }
 
+eval "use File::RsyncP;";
+if ( !$@ && $File::RsyncP::VERSION < 0.50 ) {
+    print("\nWarning: you need to upgrade File::RsyncP;"
+        . " I found $File::RsyncP::VERSION and BackupPC needs 0.50\n");
+}
+
 exit(0);
 
 ###########################################################################