Bug 177850: checksetup.pl was failing if the user didn't have read permissions to...

Patch by Jussi Sirpoma <jussi@comlink.fi>
r=justdave, a=justdave

diff --git a/checksetup.pl b/checksetup.pl
index aceb6a706daf9e19d80737a8f03fcc6abee84f0f..3543b45ee2feec24ca0c40b638c0a365171b6281 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -924,17 +924,15 @@ END
     if (-e 'data/template') {
         print "Removing existing compiled templates ...\n" unless $silent;
 
-        # If File::Path::rmtree reported errors, then I'd use that
-        use File::Find;
-        sub remove {
-            return if $_ eq ".";
-            if (-d $_) {
-                rmdir $_ || die "Couldn't rmdir $_: $!\n";
-            } else {
-                unlink $_ || die "Couldn't unlink $_: $!\n";
-            }
-        }
-        finddepth(\&remove, 'data/template');
+       File::Path::rmtree('data/template');
+
+       #Check that the directory was really removed
+       if(-e 'data/template') {
+           print "\n\n";
+           print "The data/template directory could not be removed. Please\n";
+           print "remove it manually and rerun checksetup.pl.\n\n";
+           exit;
+       }
     }
 
     # Precompile stuff. This speeds up initial access (so the template isn't
@@ -994,7 +992,7 @@ END
 
         use Cwd;
 
-        $::baseDir = getcwd();
+        $::baseDir = cwd();
 
         # Don't hang on templates which use the CGI library
         eval("use CGI qw(-no_debug)");