Merge tag 'v2.0.27' into master.

[user/henk/code/inspircd.git] / make / template / inspircd

diff --git a/make/template/inspircd b/make/template/inspircd
index cb2d2902d520eca9752a7cf0da4b4f4004c9a2c4..e860c70f82d854e441afdd626db0867e0762b02a 100644 (file)
--- 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;
@@ -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";
 }