Item11512: ConfigureCheckPlugin requires that checkers compile stand-…

…alone git-svn-id: http://svn.foswiki.org/trunk@14291 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Mar 12, 2012 · bfeece1 · bfeece1
1 parent f6a64f9
commit bfeece1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/core/lib/Foswiki/Configure/Checkers/ScriptDir.pm b/core/lib/Foswiki/Configure/Checkers/ScriptDir.pm
@@ -11,12 +11,14 @@ sub check {
     my $this = shift;
 
     my $e = $this->guessMajorDir( 'ScriptDir', 'bin' );
-    $e .= $this->warnAboutWindowsBackSlashes( $Foswiki::cfg{ScriptDir} );
+    my $val = $Foswiki::cfg{ScriptDir};
+    $e .= $this->warnAboutWindowsBackSlashes( $val );
 
-    $e .= $this->showExpandedValue( $Foswiki::cfg{ScriptDir} )
+    $e .= $this->showExpandedValue( $val )
       if $Foswiki::cfg{ScriptDir} =~ /\$Foswiki::cfg/;
 
-    my $e2 = _checkBinDir( $this, $this->getCfg("{ScriptDir}") );
+    Foswiki::Configure::Load::expandValue($val);
+    my $e2 = _checkBinDir( $this, $val);
     $e .= $e2 if $e2;
     return $e;
 }

diff --git a/core/lib/Foswiki/Configure/Checkers/ScriptSuffix.pm b/core/lib/Foswiki/Configure/Checkers/ScriptSuffix.pm
@@ -10,8 +10,8 @@ our @ISA = ('Foswiki::Configure::Checker');
 sub check {
     my $this = shift;
     my $currentSuffix;
-
-    my $scriptName = Foswiki::getScriptName();
+    require Foswiki::Configure::Util;
+    my $scriptName = Foswiki::Configure::Util::getScriptName();
     ($currentSuffix) = $scriptName =~ m/configure(.*)$/;
 
     if ( defined $currentSuffix && $currentSuffix ) {