From: Devin Austin Date: Sun, 12 Jul 2009 17:43:03 +0000 (+0000) Subject: unfucked X-Git-Tag: 1.21_01~1^2~51 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Devel.git;a=commitdiff_plain;h=620dd287c46cbbf331bab2fa244db3008a46b483 unfucked --- diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index ed9ea20..4ce0071 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -239,6 +239,7 @@ sub mk_file { $file .= '.new'; } } + if ( my $f = IO::File->new("> $file") ) { binmode $f; print $f $content; @@ -442,7 +443,7 @@ sub _mk_create { sub _mk_compclass { my $self = shift; my $file = $self->{file}; - return $self->render_sharedir_file( 'lib', 'Helper', 'compclass.pl.tt', "$file" ); + return $self->render_sharedir_file( 'lib', 'Helper', 'compclass.tt', "$file" ); } sub _mk_comptest { @@ -495,41 +496,6 @@ sub _deprecate_file { } -## this is so you don't have to do make install after every change to test -sub _find_share_dir { - my ($self, $args) = @_; - my $share_name = $self->name; - if ($share_name =~ s!^/(.*?)/!!) { - my $dist = $1; - $args->{share_base_dir} = eval { - Dir->new(File::ShareDir::dist_dir($dist)) - ->subdir('share'); - }; - if ($@) { - # not installed - my $file = __FILE__; - my $dir = Dir->new(dirname($file)); - my $share_base; - while ($dir->parent) { - if (-d $dir->subdir('share') && -d $dir->subdir('share')->subdir('root')) { - $share_base = $dir->subdir('share')->subdir('root'); - last; - } - $dir = $dir->parent; - } - confess "could not find sharebase by recursion. ended up at $dir, from $file" - unless $share_base; - $args->{share_base_dir} = $share_base; - } - } - my $base = $args->{share_base_dir}->subdir($share_name); - confess "No such share base directory ${base}" - unless -d $base; - $self->share_dir($base); -}; - - - =head1 DESCRIPTION This module is used by B to create a set of scripts for a