Avoid troublesome abs_path calls in wrapper setup
As documented in the forum post.master
parent
fda61c9349
commit
e630e7507e
|
@ -4,14 +4,14 @@ package IkiWiki;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
use Cwd q{abs_path};
|
use File::Spec;
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
|
||||||
sub gen_wrapper () { #{{{
|
sub gen_wrapper () { #{{{
|
||||||
$config{srcdir}=abs_path($config{srcdir});
|
$config{srcdir}=File::Spec->rel2abs($config{srcdir});
|
||||||
$config{destdir}=abs_path($config{destdir});
|
$config{destdir}=File::Spec->rel2abs($config{destdir});
|
||||||
my $this=abs_path($0);
|
my $this=File::Spec->rel2abs($0);
|
||||||
if (! -x $this) {
|
if (! -x $this) {
|
||||||
error(sprintf(gettext("%s doesn't seem to be executable"), $this));
|
error(sprintf(gettext("%s doesn't seem to be executable"), $this));
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
|
||||||
(Simon McVittie)
|
(Simon McVittie)
|
||||||
* Really fix bug with links to pages with names containing colons.
|
* Really fix bug with links to pages with names containing colons.
|
||||||
Previous fix mised a few cases.
|
Previous fix mised a few cases.
|
||||||
|
* Avoid troublesome abs_path calls in wrapper setup.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
|
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
|
||||||
|
|
||||||
|
|
|
@ -132,6 +132,4 @@ like this being accepted before I bothered.
|
||||||
>> hrm. I might see if <code> File::Spec->rel2abs( $path ) ; </code> will give absolute an path without expanding symlinks.
|
>> hrm. I might see if <code> File::Spec->rel2abs( $path ) ; </code> will give absolute an path without expanding symlinks.
|
||||||
>>> Patch using rel2abs() works well - it no longer expands symlinks.
|
>>> Patch using rel2abs() works well - it no longer expands symlinks.
|
||||||
|
|
||||||
> I suppose you could do the same thing with `$this`, but it does not sound
|
>>>> That patch is applied now. --[[Joey]]
|
||||||
> like it has caused you problems anyway.
|
|
||||||
> --[[Joey]]
|
|
||||||
|
|
Loading…
Reference in New Issue