Permalink
Browse files

Merge branch 'hotfix/chmod'

  • Loading branch information...
2 parents 3070242 + 66cd55a commit 9f4090d4ecc0e2ddfeb532509458ad5cb9071c85 @szabgab committed Dec 11, 2011
Showing with 13 additions and 5 deletions.
  1. +5 −1 Changes
  2. +1 −0 Makefile.PL
  3. +1 −1 lib/Dwimmer.pm
  4. +1 −1 lib/Dwimmer/Admin.pm
  5. +1 −1 lib/Dwimmer/Client.pm
  6. +1 −1 lib/Dwimmer/Tools.pm
  7. +3 −0 script/dwimmer_setup.pl
View
@@ -1,6 +1,10 @@
Changes to the Dwimmer system. See http://dwimmer.org/
-v0.24 2011.11.08
+v0.25 2011.12.11
+ - use File::Find::Rule to chmod 0644 files before trying
+ to overwrite them during installation
+
+v0.24 2011.12.08
- Add RSS feed with basic testing (#30)
- integrated the CLEditor Javascript based html editor (#15)
View
@@ -10,6 +10,7 @@ use inc::Module::Install 1.00;
# stuff above here no longer needed.
configure_requires 'ExtUtils::MakeMaker' => '6.52';
configure_requires 'File::Copy::Recursive' => 0;
+configure_requires 'File::Find::Rule' => 0;
configure_requires 'File::Spec' => 0;
name 'Dwimmer';
View
@@ -3,7 +3,7 @@ use Dancer ':syntax';
use 5.008005;
-our $VERSION = '0.24';
+our $VERSION = '0.25';
use Data::Dumper qw(Dumper);
use Dwimmer::DB;
@@ -3,7 +3,7 @@ use Dancer ':syntax';
use 5.008005;
-our $VERSION = '0.24';
+our $VERSION = '0.25';
use Data::Dumper qw(Dumper);
use Email::Valid ();
@@ -8,7 +8,7 @@ has host => ( is => 'ro', isa => 'Str', required => 1 );
has mech => ( is => 'rw', isa => 'WWW::Mechanize', default => sub { WWW::Mechanize->new } );
-our $VERSION = '0.24';
+our $VERSION = '0.25';
# get_user parameters can be id => 1
@@ -9,7 +9,7 @@ use YAML;
use Dwimmer::DB;
-our $VERSION = '0.24';
+our $VERSION = '0.25';
our $SCHEMA_VERSION = 1;
@@ -8,6 +8,7 @@
use Email::Valid;
use File::Basename qw(dirname);
use File::Copy::Recursive;
+use File::Find::Rule;
use File::Path qw(mkpath);
use File::Spec;
use File::ShareDir;
@@ -90,11 +91,13 @@
my $from = File::Spec->catdir( $dist_dir, $dir );
my $to = File::Spec->catdir( $opt{root}, $dir );
print "dircopy $from $to\n";
+ chmod 0644, File::Find::Rule->file()->in($to);
File::Copy::Recursive::dircopy( $from, $to ) or die $!;
}
my $from = File::Spec->catdir( $dist_dir, 'config.yml');
my $to = File::Spec->catdir( $opt{root} );
print "fcopy $from $to\n";
+ chmod 0644, File::Find::Rule->file()->in($to);
File::Copy::Recursive::fcopy( $from, $to ) or die $!;
}

0 comments on commit 9f4090d

Please sign in to comment.