Skip to content

Commit 676721d

Browse files
committed
fix: Fix running from sources from using symbolic links
1 parent dbf3bd3 commit 676721d

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

lib/setup.pm

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use warnings;
66
use parent qw(Exporter);
77

88
use File::Spec;
9-
use Cwd qw(abs_path);
9+
use File::Basename qw(dirname);
1010

1111
our @EXPORT = ('%setup');
1212

@@ -16,19 +16,18 @@ our %setup = (
1616
vardir => './var',
1717
);
1818

19-
# Compute directly libdir from this setup file as it should be installed
20-
# in expected directory
19+
# Compute directly libdir from this setup file as it should be installed in expected directory
2120
eval {
22-
$setup{libdir} = abs_path(File::Spec->rel2abs('..', __FILE__))
23-
unless ($setup{libdir} && File::Spec->file_name_is_absolute($setup{libdir}));
21+
$setup{libdir} = File::Spec->rel2abs(dirname(__FILE__))
22+
unless $setup{libdir} && File::Spec->file_name_is_absolute($setup{libdir});
2423

2524
# If run from sources, we can try to rebase setup keys to absolute folders related to libdir
2625
if (File::Spec->file_name_is_absolute($setup{libdir})) {
2726
foreach my $key (qw(datadir vardir)) {
2827
# Anyway don't update if target still absolute
29-
next if ($setup{$key} && File::Spec->file_name_is_absolute($setup{$key}));
28+
next if $setup{$key} && File::Spec->file_name_is_absolute($setup{$key});
3029

31-
my $folder = abs_path(File::Spec->rel2abs('../'.$setup{$key}, $setup{libdir}));
30+
my $folder = File::Spec->rel2abs($setup{$key}, dirname($setup{libdir}));
3231
$setup{$key} = $folder if $folder && -d $folder;
3332
}
3433
}

0 commit comments

Comments
 (0)