--- cthumb.in.orig	Tue Aug 13 21:24:05 2002
+++ cthumb.in	Tue Jan 27 15:56:20 2004
@@ -476,6 +476,7 @@
     if ($CheckThumbnails) {
 	eval "require Image::Size";
 	if (defined $Image::Size::VERSION) {
+	    $Image::Size::VERSION = $Image::Size::VERSION;
 	    $HaveImageSizePerlModule=1;
 	}
     }
@@ -579,7 +580,10 @@
     if ($NoMainIndex) {
 	unlink($indextmp);
     } else {
-        if (system ("diff $indextmp $MainIndexName >/dev/null 2>/dev/null")) {
+ 	local $ENV{SHELL}='/bin/sh';
+ 	system ("diff $indextmp $MainIndexName >/dev/null 2>/dev/null");
+ 	my $difret = $? >> 8;
+	if ($difret != 0) {
 	    print "Index for $descfname in: $MainIndexName\n";
 	    my $cmd = "mv $indextmp $MainIndexName";
 	    if (system($cmd)) { print "cthumb warning: command '$cmd' failed: $!\n"; }