]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Update perl config parser in start script
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Tue, 13 Oct 2009 18:53:29 +0000 (18:53 +0000)
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Tue, 13 Oct 2009 18:53:29 +0000 (18:53 +0000)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11870 e03df62e-2008-0410-955e-edbf42e46eb7

.inspircd.inc

index 486e4cec2ab262c87236bdafe0e184f13bcb1c8f..d65df60b356f7d0158e3194257e437e03499af5b 100644 (file)
@@ -303,7 +303,7 @@ sub getpidfile
        # Are We using a relative path?
        if ($file !~ /^\//) {
                # Convert it to a full path.
-               $file = $confpath . $file;
+               $file = $runpath . $file;
        }
 
        # Have we checked this file before?
@@ -311,7 +311,7 @@ sub getpidfile
        $filesparsed{$file} = 1;
 
        # Open the File..
-       open INFILE, "< $file" or die "Unable to open file $file included in configuration\n";
+       open INFILE, '<', $file or die "Unable to open file $file included in configuration\n";
        # Grab entire file contents..
        my(@lines) = <INFILE>;
        # Close the file
@@ -333,9 +333,9 @@ sub getpidfile
                        }
                        else
                        {
-                               if (-f $confpath . $pidfile)
+                               if (-f $runpath . $pidfile)
                                {
-                                       $pidfile = $confpath . $pidfile;
+                                       $pidfile = $runpath . $pidfile;
                                        return;
                                }
                        }
@@ -358,9 +358,9 @@ sub getpidfile
                        }
                        else
                        {
-                               if (-f $confpath . $pidfile)
+                               if (-f $runpath . $pidfile)
                                {
-                                       $pidfile = $confpath . $pidfile;
+                                       $pidfile = $runpath . $pidfile;
                                        return;
                                }
                        }
@@ -442,7 +442,7 @@ sub validateconf
        # Are We using a relative path?
        if ($file !~ /^\//) {
                # Convert it to a full path..
-               $file = $confpath . $file;
+               $file = $runpath . $file;
        }
 
        # Have we checked this file before?