X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Finspircd;h=91b2694121f2ed05eb0079c56a3b1b129810decd;hb=94ce90c588b7d919102a91d3e0f6df4188ae417b;hp=138de29a9cfdb4ef6eb060bff65fe11bbfca4007;hpb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/template/inspircd b/make/template/inspircd
index 138de29a9..91b269412 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -48,6 +48,7 @@ use constant {
     GENERIC_EXIT_NOT_RUNNING => 7
 };
 
+my $scriptpath = "@SCRIPT_DIR@";
 my $basepath	=	"@BASE_DIR@";
 my $confpath	=	"@CONFIG_DIR@/";
 my $binpath	=	"@BINARY_DIR@";
@@ -55,10 +56,10 @@ my $runpath	=	"@BASE_DIR@";
 my $datadir	=       "@DATA_DIR@";
 my $valgrindlogpath	=	"$basepath/valgrindlogs";
 my $executable	=	"inspircd";
-my $version	=	"@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@+@VERSION_LABEL@";
+my $version	=	"@VERSION_FULL@";
 my $uid = "@UID@";
 
-if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) {
+if (!(grep { $_ eq '--runasroot' } @ARGV) && ($< == 0 || $> == 0)) {
 	if ($uid !~ /^\d+$/) {
 		# Named UID, look it up
 		$uid = getpwnam $uid;
@@ -153,7 +154,7 @@ sub cmd_rehash()
 
 sub cmd_cron()
 {
-	if (getstatus() == 0) { goto &cmd_start(); }
+	if (getstatus() == 0) { goto &cmd_start(@_); }
 	exit GENERIC_EXIT_UNSPECIFIED;
 }
 
@@ -167,7 +168,7 @@ sub cmd_restart(@)
 {
 	cmd_stop();
 	unlink($pidfile) if (-e $pidfile);
-	goto &cmd_start;
+	goto &cmd_start(@_);
 }
 
 sub hid_cheese_sandwich()
@@ -203,7 +204,7 @@ sub dev_debug(@)
 	checkgdb();
 
 	# If we are still alive here.. Try starting the IRCd..
-	exec 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(--nofork --debug), @_;
+	exec 'gdb', "--command=$scriptpath/.gdbargs", '--args', "$binpath/$executable", qw(--nofork --debug), @_;
 	die "Failed to start GDB: $!\n";
 }
 
@@ -222,7 +223,7 @@ sub dev_screendebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
 	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-	exec qw(screen -m -d gdb), "--command=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+	exec qw(screen -m -d gdb), "--command=$scriptpath/.gdbargs", '-args', "$binpath/$executable", qw(--nofork --debug --nolog), @_;
 	die "Failed to start screen: $!\n";
 }
 
@@ -311,7 +312,7 @@ sub cmd_stop()
 	# Get to here, we have something to kill.
 	my $pid = getprocessid();
 	print "Stopping InspIRCd (pid: $pid)...\n";
-	my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 90 : 15;
+	my $maxwait = (`ps -o command $pid 2>/dev/null` =~ /valgrind/i) ? 90 : 15;
 	kill TERM => $pid or die "Cannot terminate IRCd: $!\n";
 	for (1..$maxwait) {
 		sleep 1;