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

diff --git a/fix-perl-path.PL b/fix-perl-path.PL
index 07bff66a37..c36381d783 100644
--- a/fix-perl-path.PL
+++ b/fix-perl-path.PL
@@ -1,18 +1,18 @@
 #!/usr/bin/perl
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 
 use strict;
@@ -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}/ ) {