Changeset 26

Show
Ignore:
Timestamp:
12/15/06 13:55:11 (2 years ago)
Author:
ingy
Message:
 r2330@skinny:  ingy | 2006-12-15 13:25:16 -0800
 Unify the two 'kwiki' command line scripts into one script.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/Kwiki/kwiki

    r25 r26  
    44use warnings; 
    55our $VERSION = '0.40'; 
    6 use Cwd 'abs_path'; 
     6use Cwd 'cwd', 'abs_path'; 
    77use FindBin; 
    88use Config; 
    …… 
    1616    $bin =~ s/.*\///; 
    1717    $bin = "$base/$bin"; 
     18    my $home = cwd(); 
    1819    while (-l $bin) { 
     20        chdir $base; 
    1921        $bin = abs_path(readlink $bin); 
    2022        $base = $bin; 
    2123        $base =~ s/(.*)\/.*/$1/; 
    2224    } 
    23     $base = abs_path("$base/.."); 
    24     return $base if -d "$base/lib/Kwiki"; 
     25    chdir $home; 
     26    $base = abs_path("$base/../.."); 
     27    return $base if -d "$base/lib/Kwiki" and -d "$base/core/Kwiki"; 
    2528 
    2629    if ($ENV{HOME}) {