fixed autogenerated config bug: > instead of >>

git-svn-id: svn://botcastle1b/yplom/facebug1@17 7dec801f-c475-4e67-ba99-809552d69c55

diff --git a/bot.1.pl b/bot.1.pl
index 02231274feadc226ca2c6ba37eb08646b3eae1a4..ba59f2935d9aa980a51960b692394a624550404b 100644 (file)
--- a/bot.1.pl
+++ b/bot.1.pl
@@ -1755,6 +1755,14 @@ sub facebooktime {
                        $hour += 12;
                }
        }
                        $hour += 12;
                }
        }

+       elsif ($timetext =~ /^ *today +at +([0-9]{1,2}):([0-9]{2})([ap]m) */) {
+               $hour=int($1);
+               $minute=int($2);
+               $ampm=$3;
+               if($ampm eq 'pm') {
+                       $hour += 12;
+               }
+       }

        else {
                # print "FAIL 1 -".urlencode($timetext)."-\n";
                return $timetext;
        else {
                # print "FAIL 1 -".urlencode($timetext)."-\n";
                return $timetext;

diff --git a/configure.pl b/configure.pl
index c60e97f3de1dba9b8bf87776df262b6cb5845560..62822464d89350c525cbb46c19b7970cf4744e91 100644 (file)
--- a/configure.pl
+++ b/configure.pl
@@ -99,7 +99,7 @@ $wwwpath =~ s/\/$//;
 $def{'CGI_ALIAS'}  = 'ScriptAlias '.$set{'interface_path'}.'/view '.$set{'bin_path'}.'interface';
 $def{'PATH_ALIAS'} = 'Alias       '.$set{'interface_path'}.'      '.$wwwpath; 
 
 $def{'CGI_ALIAS'}  = 'ScriptAlias '.$set{'interface_path'}.'/view '.$set{'bin_path'}.'interface';
 $def{'PATH_ALIAS'} = 'Alias       '.$set{'interface_path'}.'      '.$wwwpath; 
 

-$def{'BOT_CRONTAB'}       = $set{'bot_crontab'}.' '.$set{'bin_path'}.'bot'.(($set{'bot_args'} ne '')?(' '.$set{'bot_args'}):'').' >'.$set{'log_path'}.'bot.log';
+$def{'BOT_CRONTAB'}       = $set{'bot_crontab'}.' '.$set{'bin_path'}.'bot'.(($set{'bot_args'} ne '')?(' '.$set{'bot_args'}):'').' >> '.$set{'log_path'}.'bot.log';

 $def{'RM_ACCESS_CRONTAB'} = $set{'rm_access_crontab'}.' '.$set{'bin_path'}.'rmaccess';
 $def{'OLDLOGS_CRONTAB'}   = $set{'oldlogs_crontab'}.' '.$set{'proxy_bin_path'}.'oldlogs '.$set{'log_path'}.' '.$set{'log_size_limit'}.' '.$set{'logs_total'}.' '.$set{'logs_uncompressed'};
 
 $def{'RM_ACCESS_CRONTAB'} = $set{'rm_access_crontab'}.' '.$set{'bin_path'}.'rmaccess';
 $def{'OLDLOGS_CRONTAB'}   = $set{'oldlogs_crontab'}.' '.$set{'proxy_bin_path'}.'oldlogs '.$set{'log_path'}.' '.$set{'log_size_limit'}.' '.$set{'logs_total'}.' '.$set{'logs_uncompressed'};