X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=149eb04a6776f249477022bf1461132c5d75307e;hb=685861f2bd0e30d7dcf74ff4cb97fd77e73d8463;hp=87a162a31b12699a51a3ee03672e678574694b7d;hpb=bc14912c0cce02f6cdd94352935d1ae123a5f9c0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index 87a162a31..149eb04a6 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -15,11 +15,12 @@
 #               I HATE PERL.. kthxbye
 # ---------------------------------------------------
 
-my $basepath = "@BASE_DIR@";
-my $confpath = "@CONFIG_DIR@/";
-my $binpath = "@BINARY_DIR@";
-my $libpath = "@LIBRARY_DIR@";
-my $executable = "@EXECUTABLE@";
+my $basepath	=	"@BASE_DIR@";
+my $confpath	=	"@CONFIG_DIR@/";
+my $binpath	=	"@BINARY_DIR@";
+my $libpath	=	"@LIBRARY_DIR@";
+my $executable	=	"@EXECUTABLE@";
+my $version	=	"@VERSION@";
 my @filesparsed;
 
 # Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
@@ -46,7 +47,7 @@ if ($arg eq "rehash") {
 	if (getstatus() == 1) {
 		my $pid = getprocessid();
 	        system("kill -HUP $pid >/dev/null 2>&1");
-		print "InspIRCd rehashed.\n";
+		print "InspIRCd rehashed (pid: $pid).\n";
 		exit();
 	} else {
 		print "InspIRCd is not running. (Or PID File not found)\n";
@@ -59,6 +60,11 @@ if ($arg eq "cron") {
 	exit();
 }
 
+if ($arg eq "version") {
+	print "InspIRCd version: $version\n";
+	exit();
+}
+
 if ($arg eq "restart") {
 	stop();
 	unlink($pidfile) if (-e $pidfile);
@@ -77,7 +83,7 @@ if ($arg eq "Cheese-Sandwich") {
 # If we get here.. bad / no parameters.
 ###
 print "Invalid Argument: $arg\n";
-print "Usage: inspircd (start|stop|restart|rehash|status|cron)\n";
+print "Usage: inspircd (start|stop|restart|rehash|status|cron|version)\n";
 exit();
 
 ###
@@ -163,11 +169,13 @@ sub stop {
         if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return 0; }
         # Get to here, we have something to kill.
         my $pid = getprocessid();
-	print "Stopping InspIRCd...\n";
+	print "Stopping InspIRCd (pid: $pid)...\n";
         system("kill -TERM $pid >/dev/null 2>&1");
+	# Give it a second to exit
+	sleep(1);
 	if (getstatus() == 1)
 	{
-		print "InspIRCd not dying Quietly -- Forcing Kill\n";
+		print "InspIRCd not dying quietly -- forcing kill\n";
 		system("kill -9 $pid >/dev/null 2>&1");
 	}
         print "InspIRCd Stopped.\n";
@@ -178,6 +186,13 @@ sub stop {
 # when it is added, it comes around and BITES ME IN THE ASS,
 # because i then have to code support into this script.. Evil.
 
+# Craig got bitten in the ass again --
+# in 1.1 beta the include file is manditory, therefore
+# if we cant find it, default to %conf%/inspircd.pid.
+# Note, this also contains a fix for when the pid file is
+# defined, but defined in a comment (line starts with #)
+# -- Brain
+
 sub getpidfile {
   my ($file) = @_;
   # Before we start, do we have a PID already? (Should never occur)
@@ -202,30 +217,30 @@ sub getpidfile {
   $filesparsed[$filesparsed] = $file;
 
   # Open the File..
-  open INFILE, "< $file" or die "Unable to Open file $file\n";
+  open INFILE, "< $file" or die "Unable to open file $file\n";
   # Grab entire file contents..
   my(@lines) = <INFILE>;
   # Close the file
   close INFILE;
 
-  # Clean up the file, no newlines etc..
+  # remove trailing spaces
   chomp(@lines);
   foreach $i (@lines) {
+    # clean it up
     $i =~ s/[^=]+=\s(.*)/\1/;
-  }
-  my $tmp = join("",@lines);
-
-  # Does this file have a pid?
-  if ($tmp =~ /<pid file=\"(\S+)\">/i) {
-    # Set the PID file and return.
-    $pidfile = $1;
-    return;
+    # Does this file have a pid?
+    if (($i =~ /<pid file=\"(\S+)\">/i) && ($i !~ /^#/))
+    {
+      # Set the PID file and return.
+      $pidfile = $1;
+      return;
+    }
   }
 
-  # If we get here, NO PID FILE! -- Check for includes (Seeing as we will eventually return,
-  # The while (1) is safe.)
-  while (1) {
-    if ($tmp =~ s/\<include file=\"(.+?)\"\>//i)
+  # If we get here, NO PID FILE! -- Check for includes
+  foreach $i (@lines) {
+    $i =~ s/[^=]+=\s(.*)/\1/;
+    if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
     {
       # Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
       getpidfile($1);
@@ -234,11 +249,11 @@ sub getpidfile {
         # Yes, Return.
         return;
       }
-    } else {
-      # End of includes / No includes found.
-      return;
     }
   }
+
+  # End of includes / No includes found. Using default.
+  $pidfile = $confpath . "inspircd.pid";
 }
 
 sub getstatus {