Skip to content

Commit

Permalink
Item1126: replace broken code for finding the LocalLib.cfg. I'm sligh…
Browse files Browse the repository at this point in the history
…tly concerned this is broken in 1.0.1, but masked by the way most of the scripts work

git-svn-id: http://svn.foswiki.org/trunk@2625 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
CrawfordCurrie authored and CrawfordCurrie committed Feb 23, 2009
1 parent 67768bd commit 42235d0
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions core/bin/setlib.cfg
Expand Up @@ -30,14 +30,12 @@
# $ENV{FOSWIKI_ASSERTS} = 1;
# to your bin/LocalLib.cfg

use vars qw( $foswikiLibPath @localPerlLibPath );
our $foswikiLibPath;
our @localPerlLibPath;

require FindBin;
my ($bin) = $FindBin::Bin =~ /^(.*)$/;
use Cwd ();
my ($LocalLib) = Cwd::abs_path( "$bin/LocalLib.cfg" ) =~ /(.*)/;

eval 'require "'.$LocalLib.'";';
my $LocalLib = $INC{'setlib.cfg'}; # the dir where this setlib.cfg resides
$LocalLib =~ s/setlib.cfg$/LocalLib.cfg/;
do $LocalLib if -r $LocalLib;

# if foswikiLibPath isn't defined, then see if $twikiLibPath is
# for compatibility
Expand Down

0 comments on commit 42235d0

Please sign in to comment.