Use FindBin and send USR1 to irssi

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 4e57477ef07f362308222869ec3894dd3e4078a2..6dcc1f67e5f3563fd440a23579f09ab9c63fd0f3 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -265,6 +265,7 @@ sub postircrequest : Local {
                (uid,channel,message) VALUES($1,$2,$3)
                });
        $query->execute($c->user->id,$c->req->param('channel'),$c->req->param('message'));
+       system 'killall','-USR1', 'irssi';
 
        $c->flash(reply => "Msg sent to: ".$c->req->param('channel'));
        $c->res->redirect($c->uri_for('ircrequest'));

diff --git a/scripts/fetchdumps.pl b/scripts/fetchdumps.pl
index 2579f38532688463e9b3a7a4ad07f0c6da32f7eb..1bb0736fb3093e04bbd51069f203666a43df77ed 100755 (executable)
--- a/scripts/fetchdumps.pl
+++ b/scripts/fetchdumps.pl
@@ -27,7 +27,9 @@ use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
 
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
 use ND::DB;
 
 our $dbh = ND::DB::DB();
@@ -51,11 +53,12 @@ for my $type ("planet","alliance","galaxy"){
 }
 
 if ($updated){
-       `/var/www/ndawn/scripts/parsealliances.pl $updated`;
-       `/var/www/ndawn/scripts/parseplanets.pl $updated`;
-       `/var/www/ndawn/scripts/parsegalaxies.pl $updated`;
-       `/var/www/ndawn/scripts/ndrank.pl`;
+       `perl $FindBin::Bin/parsealliances.pl $updated`;
+       `perl $FindBin::Bin/parseplanets.pl $updated`;
+       `perl $FindBin::Bin/parsegalaxies.pl $updated`;
+       `perl $FindBin::Bin/ndrank.pl`;
        $dbh->do(q{UPDATE misc SET value = ? WHERE id = 'TICK'}, undef, $updated);
+       system 'killall','-USR1', 'irssi';
        local $dbh->{Warn} = 0;
        $dbh->do(q{VACUUM ANALYZE});
 }

diff --git a/scripts/ndrank.pl b/scripts/ndrank.pl
index e5d152c936f64208a2e78e396b5586ed0d189ff4..acb1405d3a282ede1bcd1adf73e1746b1dcbdebf 100755 (executable)
--- a/scripts/ndrank.pl
+++ b/scripts/ndrank.pl
@@ -27,7 +27,9 @@ use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
 
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
 use ND::DB;
 
 our $dbh = ND::DB::DB();

diff --git a/scripts/parsealliances.pl b/scripts/parsealliances.pl
index f8daeaf40d961d2ba5b0c7eff01517c23c0a749d..bc43e96a74aa513a3255c65a4f6eaa327f93d731 100755 (executable)
--- a/scripts/parsealliances.pl
+++ b/scripts/parsealliances.pl
@@ -27,7 +27,8 @@ use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
 
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 use ND::Include;
 use ND::DB;

diff --git a/scripts/parsegalaxies.pl b/scripts/parsegalaxies.pl
index af9d6ec04c102ace12e47b9a8f3ac30dcdf09104..95194be2c1ca94727c79d503b1267228fce9e5b4 100755 (executable)
--- a/scripts/parsegalaxies.pl
+++ b/scripts/parsegalaxies.pl
@@ -27,7 +27,8 @@ use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
 
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 use ND::Include;
 use ND::DB;

diff --git a/scripts/parseplanets.pl b/scripts/parseplanets.pl
index e3c013ac1790d5accbfc52a17c309d176b0c837e..fa31c1ecaa10a1648a311627fd6015959fa130e2 100755 (executable)
--- a/scripts/parseplanets.pl
+++ b/scripts/parseplanets.pl
@@ -27,7 +27,8 @@ use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
 
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 use ND::Include;
 use ND::DB;

diff --git a/scripts/reset_hosts.pl b/scripts/reset_hosts.pl
index 20f01028b9c93ada5cbd2d92b5d5334d9ff6119a..040445b90b786fa9de102df85c3cba29a9f59dc1 100755 (executable)
--- a/scripts/reset_hosts.pl
+++ b/scripts/reset_hosts.pl
@@ -6,7 +6,10 @@ use DBI;
 use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
-use lib qw{/var/www/ndawn/lib/};
+
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
 use ND::DB;
 
 our $dbh = ND::DB::DB();

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 818be591e37d8937162fa6b98f2e3f59631d1d7a..182fe088b47a0c07386269932b06a69c890f4500 100755 (executable)
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -91,6 +91,8 @@ $dbh->begin_work or die 'No transaction';
 $newscans->execute or die $dbh->errstr;
 $dbh->pg_savepoint('scans') or die "No savepoint";
 
+my $parsedscans = 0;
+
 while (my $scan = $newscans->fetchrow_hashref){
        $dbh->pg_release('scans') or die "Couldn't save";
        $dbh->pg_savepoint('scans') or die "Couldn't save";
@@ -206,6 +208,7 @@ while (my $scan = $newscans->fetchrow_hashref){
                }
                $parsedscan->execute($tick,$type,$planet,$scan->{id}) or die $dbh->errstr;
                #$dbh->rollback;
+               ++$parsedscans;
                };
                if ($@) {
                        warn $@;
@@ -220,6 +223,8 @@ while (my $scan = $newscans->fetchrow_hashref){
 #$dbh->rollback;
 $dbh->commit;
 
+system 'killall','-USR1', 'irssi' if $parsedscans;
+
 sub addfleet {
        my ($name,$mission,$ships,$sender,$target,$tick,$eta,$back,$amount,$ingal) = @_;
 

diff --git a/scripts/stats.pl b/scripts/stats.pl
index f5e11ec539f106f7d463adf5b2a755a7854ef41b..706d7c70ff78a8c3ae4cd00adaf4f4a21238ee51 100755 (executable)
--- a/scripts/stats.pl
+++ b/scripts/stats.pl
@@ -26,7 +26,10 @@ use DBI;
 use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
-use lib qw{/var/www/ndawn/lib/};
+
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
 use ND::DB;
 
 our $dbh = ND::DB::DB();

diff --git a/scripts/tick.pl b/scripts/tick.pl
index 5f8b86267ad15edbfa9fb61c4cba3ee1b4413b09..232dfc6797f7bf63bcb0dc319981fabe6f7a95f2 100755 (executable)
--- a/scripts/tick.pl
+++ b/scripts/tick.pl
@@ -7,11 +7,14 @@ use DBD::Pg qw(:pg_types);
 
 use LWP::Simple;
 
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
 use ND::DB;
 
 our $dbh = ND::DB::DB();
 
 my $update = $dbh->prepare("UPDATE misc SET value = value::int + 1 WHERE id = 'TICK'");
 $update->execute();
+system 'killall','-USR1', 'irssi';
 $dbh->disconnect;