--- loncom/configuration/Checksumming.pm 2013/02/08 15:14:22 1.5 +++ loncom/configuration/Checksumming.pm 2017/06/30 14:53:39 1.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Checksum installed LON-CAPA modules and some configuration files # -# $Id: Checksumming.pm,v 1.5 2013/02/08 15:14:22 raeburn Exp $ +# $Id: Checksumming.pm,v 1.8 2017/06/30 14:53:39 raeburn Exp $ # # The LearningOnline Network with CAPA # @@ -34,6 +34,7 @@ use strict; use lib '/home/httpd/lib/perl/'; use Apache::lonlocal(); use Apache::loncommon(); +use Digest::SHA; sub get_checksums { my ($distro,$londaemons,$lonlib,$lonincludes,$lontabdir) = @_; @@ -62,12 +63,8 @@ sub get_checksums { } push(@paths,('/home/httpd/cgi-bin/*.pl','/home/httpd/cgi-bin/*.png')); my $confdir = '/etc/httpd/conf'; - my $sha = 'SHA1'; if ($distro =~ /^(ubuntu|debian)(\d+)$/) { $confdir = '/etc/apache2'; - if (($1 eq 'ubuntu') && ($2 >= 12)) { - $sha = 'SHA'; - } } elsif ($distro =~ /^sles(\d+)$/) { if ($1 >= 10) { $confdir = '/etc/apache2'; @@ -78,10 +75,8 @@ sub get_checksums { } } push(@paths,("$confdir/loncapa_apache.conf","$confdir/startup.pl")); - if ($sha eq 'SHA1') { - require Digest::SHA1; - } else { - require Digest::SHA; + if ($lontabdir) { + push(@paths,$lontabdir.'/mydesk.tab'); } if (@paths) { my $pathstr = join (' ',@paths); @@ -98,12 +93,7 @@ sub get_checksums { my $sum; if (open(my $fh,"<$key")) { binmode $fh; - my $sha_obj; - if ($sha eq 'SHA') { - $sha_obj = Digest::SHA->new(); - } else { - $sha_obj = Digest::SHA1->new(); - } + my $sha_obj = Digest::SHA->new(); $sha_obj->addfile($fh); $sum = $sha_obj->hexdigest; close($fh); @@ -277,7 +267,8 @@ sub compare_checksums { foreach my $file (sort(keys(%missing))) { my $revnum = $stdversions{$file}; if ($target eq 'web') { - $message .= ''.$file.''."\n". + $message .= &Apache::loncommon::start_data_table_row()."\n". + ''.$file.''."\n". ''.$revnum.''."\n". &Apache::loncommon::end_data_table_row()."\n"; } else { @@ -313,7 +304,8 @@ sub compare_checksums { } foreach my $file (sort(keys(%extra))) { if ($target eq 'web') { - $message .= ''.$file.''."\n". + $message .= &Apache::loncommon::start_data_table_row()."\n". + ''.$file.''."\n". ''.$serverversions->{$file}.''."\n". &Apache::loncommon::end_data_table_row()."\n"; } else {