summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-01-29 15:01:37 +0000
committerSadie Powell <sadie@witchery.services>2021-01-29 15:01:37 +0000
commitce05e885a9258139eb7b076c29a70b5f8d366209 (patch)
treec231c7e24a179d0105f15ec7b18930ff63c878f8 /make
parent0e5081e87c1609d3c4a9855775ee562ceab485f6 (diff)
Remove unnecessary chdirs in the helper script.
Diffstat (limited to 'make')
-rw-r--r--make/template/inspircd8
1 files changed, 1 insertions, 7 deletions
diff --git a/make/template/inspircd b/make/template/inspircd
index 70072df60..c50d28c7f 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -65,7 +65,6 @@ my $scriptpath = "@SCRIPT_DIR@";
my $basepath = "@BASE_DIR@";
my $confpath = "@CONFIG_DIR@";
my $binpath = "@BINARY_DIR@";
-my $runpath = "@BASE_DIR@";
my $runtimedir = "@RUNTIME_DIR@";
my $valgrindlogpath = "$basepath/valgrindlogs";
my $executable = "inspircd";
@@ -211,8 +210,8 @@ sub cmd_start(@)
{
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; exit GENERIC_EXIT_SUCCESS; }
+
# If we are still alive here.. Try starting the IRCd..
- chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
@@ -225,7 +224,6 @@ sub dev_debug(@)
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
- chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
@@ -242,7 +240,6 @@ sub dev_screendebug(@)
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
- chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
#Check we have gdb
@@ -261,7 +258,6 @@ sub dev_valdebug(@)
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
- chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
@@ -282,7 +278,6 @@ sub dev_valdebug_unattended(@)
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
- chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
@@ -319,7 +314,6 @@ sub dev_screenvaldebug(@)
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
- chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");