Item10058: Don't rewrite file if not necessary

git-svn-id: http://svn.foswiki.org/branches/Release01x01@10029 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 22, 2010 · db37a80 · db37a80
1 parent d75e683
commit db37a80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/UnitTestContrib/test/unit/ConfigureTests.pm b/UnitTestContrib/test/unit/ConfigureTests.pm
@@ -852,9 +852,11 @@ sub test_Util_rewriteShebang {
     _doRewriteTest( $this, $tempdir, '#!/usr/bin/perl -wT',
         '/usr/bin/perl', '#! /usr/bin/perl -wT' );
     _doRewriteTest( $this, $tempdir, '#! /usr/bin/perl -wT',
+        '/usr/bin/perl', '#! /usr/bin/perl -wT', 'No change required' );
+    _doRewriteTest( $this, $tempdir, '#!/usr/bin/perl -wT',
         '/usr/bin/perl', '#! /usr/bin/perl -wT' );
     _doRewriteTest( $this, $tempdir, '#! /usr/bin/perl ',
-        '/usr/bin/perl', '#! /usr/bin/perl ' );
+        '/usr/bin/perl', '#! /usr/bin/perl ', 'No change required' );
     _doRewriteTest( $this, $tempdir, '#! /usr/bin/perl -wT ',
         '/my/bin/perl', '#! /my/bin/perl -wT ' );
     _doRewriteTest(

diff --git a/core/lib/Foswiki/Configure/Util.pm b/core/lib/Foswiki/Configure/Util.pm
@@ -591,6 +591,8 @@ sub rewriteShebang {
       ( substr( $contents, $perlIdx - 1, 1 ) eq ' ' ? '' : ' ' )
       . "$newShebang";
 
+    return "No change required" if ($match eq $newShebang && substr( $contents, $perlIdx - 1, 1 ) eq ' ');
+
     my $mode = ( stat($file) )[2];
     $file =~ /(.*)/;
     $file = $1;