Changeset 16

Show
Ignore:
Timestamp:
12/11/06 10:41:55 (2 years ago)
Author:
ingy
Message:
Fix bug for kwiki -new.
Generate lib symlink on kwiki -new.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bin/kwiki

    r15 r16  
    1414 
    1515sub find_base { 
    16     return $ENV{KWIKI_REPOSITORY_BASE} 
    17       if defined $ENV{KWIKI_REPOSITORY_BASE}; 
     16    return $ENV{KWIKI_BASE} 
     17      if defined $ENV{KWIKI_BASE}; 
    1818    my $base = $FindBin::Bin; 
    1919    my $bin = $0; 
    …… 
    2929    die <<'...'; 
    3030Can't locate Kwiki repository.  
    31 Try setting the KWIKI_REPOSITORY_BASE environment variable. 
     31Try setting the KWIKI_BASE environment variable. 
    3232... 
    3333}  
    …… 
    3737    die "$base is an invalid Kwiki source code repository" 
    3838      unless valid_base($base); 
    39     unless (-e 'lib') { 
    40         system("$base/bin/make-lib-tree.pl $base/* $base/plugins/*") == 0 
    41           or die "make-lib-tree.pl failed"; 
    42         die unless -d 'lib'; 
    43     } 
    44     my $lib = abs_path('lib'); 
    45     eval "use lib '$lib'; 1" 
     39    eval "use lib '$base/lib'; 1" 
    4640      or die $@; 
    47     local $ENV{KWIKI_REPOSITORY_BASE} = $base; 
     41    $ENV{KWIKI_BASE} = $base; 
    4842} 
    4943 

  • trunk/core/Kwiki/lib/Kwiki/Command.pm

    r14 r16  
    1919    $self->install('widgets'); 
    2020    io('plugin')->mkdir; 
     21    io('registry.dd')->unlink; 
     22    io->link('lib')->symlink("$ENV{KWIKI_BASE}/lib") 
     23      if defined $ENV{KWIKI_BASE}; 
    2124    $self->set_permissions; 
    2225    warn "\nKwiki software installed! Point your browser at this location.\n\n";