Changeset 439 for bot

Timestamp:

06/25/12 18:38:25 (12 years ago)

Author:

nanardon

Message:

• add sysinit script

Location:

bot/trunk

Files:

• MANIFEST (modified) (1 diff)
• bin/sophie-bot (modified) (3 diffs)
• lib/Sophie/Bot.pm (modified) (1 diff)
• lib/Sophie/Bot/IRC.pm (modified) (2 diffs)
• sophie-bot.spec.in (modified) (2 diffs)
• sysinit (added)
• sysinit/sophie-bot (added)

bot/trunk/MANIFEST

@@ -10 +10 @@
 sophie-tools.spec.in
 t/Sophie-Bot.t
+sysinit/sophie-bot

bot/trunk/bin/sophie-bot

@@ -43 +43 @@
     $runas       ||= $config{runas};
     $pidfile     ||= $config{pidfile};
+    $type        ||= $config{type};
 }
 
@@ -88 +89 @@
 }
 
-if ($runas) {
-    my ($login,$pass,$uid,$gid) = $runas =~ /^\d/
-    ? getpwuid($runas)
-    : getpwnam($runas);
-
-    $> = $uid; $) = $gid;
-    if ($> ne $uid) {
-        die "Cannot change to user $runas\n";
-    }
-}
-
 if ($daemon) {
-
     my $pid = fork();
 
@@ -121 +110 @@
 }
 
+if ($runas) {
+    my ($login,$pass,$uid,$gid) = $runas =~ /^\d/
+    ? getpwuid($runas)
+    : getpwnam($runas);
+
+    $> = $uid; $) = $gid;
+    if ($> ne $uid) {
+        die "Cannot change to user $runas\n";
+    }
+}
+
 $sc->run;
 

bot/trunk/lib/Sophie/Bot.pm

@@ -8 +8 @@
 $RPC::XML::FORCE_STRING_ENCODING = 1;
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 sub new {

bot/trunk/lib/Sophie/Bot/IRC.pm

@@ -62 +62 @@
     $heap->{nopong} ||= 0;
     if ($heap->{nopong} >= NO_PONG_TOUT) {
-        $heap->{irc}->yield( 'connect', { } );
+        $_[KERNEL]->stop;
         return;
     }
@@ -90 +90 @@
 
     $_[KERNEL]->stop;
-    #die "Nick already in use\n";
 }
 

bot/trunk/sophie-bot.spec.in

@@ -38 +38 @@
 %makeinstall_std
 
+mkdir -p %buildroot%_sysconfdir/init.d
+install -m755 sysinit/sophie-bot %buildroot%_sysconfdir/init.d/sophie-bot
+
 %clean
 rm -rf %buildroot
@@ -44 +47 @@
 %defattr(-,root,root)
 %doc Changes README
+%_sysconfdir/init.d/sophie-bot
 %_bindir/*
 %{_mandir}/*/*