--

diff --git a/perl/Triple.pm b/perl/Triple.pm
index 1d05cf63f58508ef2de2577d3a7dedbce9afa2ca..73deb83b803b11e3186f1e080f563b57b1a8c824 100644 (file)
--- a/perl/Triple.pm
+++ b/perl/Triple.pm
@@ -98,41 +98,9 @@ sub Triple::main {
     }
 }
 
-sub preinit {
-
-    sub sitename {
-
-        use Cwd;
-        my $cwd = getcwd();
-        $cwd =~ s/.*\///;
-        return $cwd;
-    }
-
-    sub debug {
-
-        my $sitename = $_[0];
-        openlog($sitename, "ndelay,pid", Sys::Syslog::LOG_DAEMON);
-        $debug = 1 if $sitename =~ /^test\./;
-    }
-
-    sub version {
-
-        open my $fh, '<', "version" or die "Can't open file: $!";
-        my $line = uc(substr(<$fh>, 0, 12));
-        close $fh;
-        return $line;
-    }
-
-    my $sitename = sitename();
-    debug($sitename);
-    my $version = version();
-    syslog("info", "<Triple $version>");
-    return $sitename, $version;
-}
-
 sub init {
 
-    sub init_static {
+    sub static {
 
         my ($sitename, $version) = @_;
         my @boards = (
@@ -159,9 +127,35 @@ sub init {
         }
     }
 
-    my ($sitename, $version) = preinit();
+    sub sitename {
+
+        use Cwd;
+        my $cwd = getcwd();
+        $cwd =~ s/.*\///;
+        return $cwd;
+    }
+
+    sub debug {
+
+        my $sitename = $_[0];
+        openlog($sitename, "ndelay,pid", Sys::Syslog::LOG_DAEMON);
+        $debug = 1 if $sitename =~ /^test\./;
+    }
+
+    sub version {
+
+        open my $fh, '<', "version" or die "Can't open file: $!";
+        my $line = uc(substr(<$fh>, 0, 12));
+        close $fh;
+        return $line;
+    }
+
+    my $sitename = sitename();
+    debug($sitename);
+    my $version = version();
+    syslog("info", "<Triple $version>");
 
-    init_static($sitename, $version);
+    static($sitename, $version);
     return $sitename, $version;
 }