Merge branch 'web' of /u/ijackson/things/ypp-sc-tools

[ypp-sc-tools.web-test.git] / yarrg / CommodsWeb.pm

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 84ea71066c186902d95b7108e874323092ff8d0b..3f0f5f5ba8320d38ed62cb0f2e3c9785a031e572 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -62,16 +62,14 @@ sub sourcebasedir () {
     
     for my $dir (@INC) {
        if ($dir =~ m/\.perl-lib$/) {
-           $dir= "$dir/..";
-           last;
+           return "$dir/..";
        }
     }
-    defined $dir or
-       die "no source base dir in @INC";
+    die "no source base dir in @INC";
     return $dir;
 }
 
-my datadir () {
+sub datadir () {
     my $dir= sourcebasedir();
     if (stat "$dir/DATA") {
        return "$dir/DATA";
@@ -86,6 +84,7 @@ my datadir () {
 my @ocean_list;
 
 sub ocean_list () {
+    my $datadir= datadir();
     if (!@ocean_list) {
        my $fn= "$datadir/master-info.txt";
        my $f= new IO::File $fn or die $!;