X-Git-Url: http://git.rot13.org/?p=koha.git;a=blobdiff_plain;f=fix-perl-path.PL;h=f81084015b762108ee8619a89534fd01a780b9e8;hp=07bff66a3726b007cbc45d1c33697a167d487659;hb=0f6882896d6a806fb474b1fd172e3e93919d960c;hpb=de04e990f269ef00fe24cb2861b6fc48b6407779

diff --git a/fix-perl-path.PL b/fix-perl-path.PL
index 07bff66a37..f81084015b 100644
--- a/fix-perl-path.PL
+++ b/fix-perl-path.PL
@@ -74,14 +74,19 @@ sub fixshebang{
 
             # At this point, file is in 'blib' and by default
             # has mode a-w.  Therefore, must change permission
-            # to make it writable.
+            # to make it writable.  Note that stat and chmod
+            # (the Perl functions) should work on Win32
             my $old_perm;
-            if ($^O ne 'MSWin32') {
-                $old_perm = (stat $pathfile)[2] & 07777;
-                my $new_perm = $old_perm | 0200;
-                chmod $new_perm, $pathfile;
-            }
-            tie @filearray, 'Tie::File', $pathfile or die $!;
+            $old_perm = (stat $pathfile)[2] & 07777;
+            my $new_perm = $old_perm | 0200;
+            chmod $new_perm, $pathfile;
+
+            # tie the file -- note that we're explicitly setting the line (record)
+            # separator to hex 0A (the Unix newline) because that's what
+            # the files copied to blib are using, regardless of whether the install
+            # is under a Unix variant or Windows.
+            tie @filearray, 'Tie::File', $pathfile, recsep => "\x0a" or die $!;
+
             warn "First line of $file is $filearray[0]\n\n" if $DEBUG;
 			if ( ( $filearray[0] =~ /#!.*perl/ ) && ( $filearray[0] !~ /$shebang|"$shebang -w"/ ) ) {
 				warn "\n\tRe-writing shebang line for $pathfile\n" if $DEBUG;
@@ -96,9 +101,7 @@ sub fixshebang{
                 warn "\n\tNo shebang line found in $pathfile\n\n" if $DEBUG;
 			}
             untie @filearray;
-            if ($^O ne 'MSWin32') {
-                chmod $old_perm, $pathfile;
-            }
+            chmod $old_perm, $pathfile;
 		}
 		# handle directories
 		elsif ( -d ($dir . '/' . $file) && $file !~ /^\.{1,2}/ ) {