Fixed ServerMesg strings in BackupPC_Admin via en.pm and fr.pm

diff --git a/cgi-bin/BackupPC_Admin b/cgi-bin/BackupPC_Admin
index 419ccb9..cd40c3e 100755 (executable)
--- a/cgi-bin/BackupPC_Admin
+++ b/cgi-bin/BackupPC_Admin
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!/bin/perl -T
 #============================================================= -*-perl-*-w
 #
 # BackupPC_Admin: Apache/CGI interface for BackupPC.
@@ -38,7 +38,7 @@
 #
 #========================================================================
 #
-# Version 1.5.0beta0, released 30 Jun 2002.
+# Version 1.5.0_CVS, released 2 Aug 2002.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -241,14 +241,15 @@ sub Action_StartStopBackup
     if ( $In{doit} ) {
         if ( $start ) {
            if ( $Hosts->{$host}{dhcp} ) {
-               $reply = $bpc->ServerMesg(eval("qq{$Lang->{backup__In_hostIP___host}}"));
+               $reply = $bpc->ServerMesg("backup $In{hostIP} $host"
+                                       . " $User $doFull");
                $str = eval("qq{$Lang->{Backup_requested_on_DHCP__host}}");
            } else {
-               $reply = $bpc->ServerMesg(eval("qq{$Lang->{backup__host__host__User__doFull}}"));
+               $reply = $bpc->ServerMesg("backup $host $host $User $doFull");
                $str = eval("qq{$Lang->{Backup_requested_on__host_by__User}}");
            }
         } else {
-            $reply = $bpc->ServerMesg(eval("qq{$Lang->{stop__host__User__In_backoff}}"));
+            $reply = $bpc->ServerMesg("stop $host $User $In{backoff}");
             $str = eval("qq{$Lang->{Backup_stopped_dequeued_on__host_by__User}}");
         }
 
@@ -1028,7 +1029,8 @@ EOF
         } else {
             ErrorExit(eval("qq{$Lang->{Can_t_open_create}}"));
         }
-       $reply = $bpc->ServerMesg(eval("qq{$Lang->{restore__ipAddr}}"));
+       $reply = $bpc->ServerMesg("restore $ipAddr"
+                       . " $hostDest $User $reqFileName");
        $str = eval("qq{$Lang->{Restore_requested_to_host__hostDest__backup___num}}");
         Header(eval("qq{$Lang->{Restore_Requested_on__hostDest}}"));
        print (eval("qq{$Lang->{Reply_from_server_was___reply}}"));

diff --git a/configure.pl b/configure.pl
index 2142fc1..8b7afed 100755 (executable)
--- a/configure.pl
+++ b/configure.pl
@@ -425,7 +425,7 @@ if ( $Conf{CgiImageDir} ne "" ) {
 }
 
 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);
 }
 

diff --git a/init.d/src/linux-backuppc b/init.d/src/linux-backuppc
index d43ac48..70e0222 100755 (executable)
--- a/init.d/src/linux-backuppc
+++ b/init.d/src/linux-backuppc
@@ -4,7 +4,7 @@
 #
 #   Startup init script for BackupPC on Redhat linux.
 #
-# Distributed with BackupPC version 1.5.0, released 2 Aug 2002.
+# Distributed with BackupPC version __VERSION__, released __RELEASEDATE__.
 #
 # chkconfig: - 91 35
 # description: Starts and stops the BackupPC server

diff --git a/init.d/src/solaris-backuppc b/init.d/src/solaris-backuppc
index e374f86..f961159 100755 (executable)
--- a/init.d/src/solaris-backuppc
+++ b/init.d/src/solaris-backuppc
@@ -4,7 +4,7 @@
 #
 #   Startup init script for BackupPC for solaris.
 #
-# Distributed with BackupPC version 1.5.0, released 2 Aug 2002.
+# Distributed with BackupPC version __VERSION__, released __RELEASEDATE__.
 #
 # Not tested...
 # 

diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm
index d0c809f..a289cc6 100644 (file)
--- a/lib/BackupPC/Lang/en.pm
+++ b/lib/BackupPC/Lang/en.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/perl -T
 
 #my %lang;
 
@@ -718,18 +718,6 @@ Until I see \$host at a particular DHCP address, you can only
 start this request from the client machine itself.
 EOF
 
-# ------------------------------------
-# !! Server Mesg !!
-# ------------------------------------
-
-# do not translate the firsts, used by server
-$Lang{backup__In_hostIP___host} = "backup \$In{hostIP} \$host"
-                                . " \$User \$doFull";
-$Lang{backup__host__host__User__doFull} = "backup \$host \$host \$User \$doFull";
-$Lang{restore__ipAddr} = "restore \$ipAddr"
-                       . " \$hostDest \$User \$reqFileName";
-$Lang{stop__host__User__In_backoff} = "stop \$host \$User \$In{backoff}";
-
 ########################
 # ok you can do it then
 ########################

diff --git a/lib/BackupPC/Lang/fr.pm b/lib/BackupPC/Lang/fr.pm
index e898cec..6fb9f52 100644 (file)
--- a/lib/BackupPC/Lang/fr.pm
+++ b/lib/BackupPC/Lang/fr.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/perl -T
 
 #my %lang;
 #use strict;
@@ -751,18 +751,6 @@ $Lang{Restore_requested_to_host__hostDest__backup___num} = "Restauration demand
              . "sauvegarde n° \$num,"
             . " par \$User depuis \$ENV{REMOTE_ADDR}";
 
-##########################
-##########################
-
-#$Lang{backup__In_hostIP___host} = "Sauvegarde \$In{hostIP} \$host"
-#                                . " \$User \$doFull";
-#
-#$Lang{backup__host__host__User__doFull} = "backup \$host \$host \$User \$doFull";
-#$Lang{restore__ipAddr} = "Restauration \$ipAddr"
-#                       . " \$hostDest \$User \$reqFileName";
-#$Lang{stop__host__User__In_backoff} = "Arrêt \$host \$User \$In{backoff}";
-
-
 # -------------------------------------------------
 # ------- Stuff that was forgotten ----------------
 # -------------------------------------------------

diff --git a/makeDist b/makeDist
index 29e7460..43c6c91 100755 (executable)
--- a/makeDist
+++ b/makeDist
@@ -10,7 +10,7 @@ use File::Copy;
 umask(0022);
 
 my $Version     = "1.5.0_CVS";
-my $ReleaseDate = "2 Aug 2002";
+my $ReleaseDate = "17 Sep 2002";
 my $DistDir     = "dist/BackupPC-$Version";
 
 my @PerlSrc = qw(
@@ -86,6 +86,7 @@ foreach my $file ( (@PerlSrc,
                conf/config.pl
                conf/hosts
                init.d/README
+               init.d/src/debian-backuppc
                init.d/src/linux-backuppc
                init.d/src/solaris-backuppc
                doc/BackupPC.pod