--- loncom/build/Attic/CHECKRPMS.default	2002/09/09 15:17:05	1.8
+++ loncom/build/Attic/CHECKRPMS.default	2003/06/19 19:23:56	1.16
@@ -72,7 +72,7 @@ if ($argument eq '--download' or $argume
   {
     if ($< != 0) # Download mode requires 'root'.
       {
-        print($out
+        print(
 	      '**** ERROR **** Download mode needs to be run as root'."\n");
 	exit(0); # Exit.
       }
@@ -103,15 +103,15 @@ my $command_name=$0;
 # ---------------- The FTP servers (and their directory paths) to check against
 my @serverpaths_to_try = 
   (
-    'distro.ibiblio.org/pub/linux/distributions/redhat/updates/',
+    'ftpmirror:loncapa@install.lon-capa.org/pub/redhat/linux/updates/',
     'mirror.pa.msu.edu/linux/redhat/linux/updates/',
+    'distro.ibiblio.org/pub/linux/distributions/redhat/updates/',
     'limestone.uoregon.edu/redhat/updates/',
     'rufus.w3.org/linux/redhat/linux/updates/',
-    'opnsrc.support.compaq.com/linux/redhat/updates.redhat.com/',
   );
 
 # -------------------------------------------- Use check-rpms command this way.
-my $checkcommand = 'check-rpms '.$download.' --rpmuser www -ftp';
+my $checkcommand = 'check-rpms -nk '.$download.' --rpmuser www -ftp';
 
 my $FTPSERVER; # ------------------------- the server portion of the serverpath
 my $FTPUPDATES; # ----------------------------- the actual update root location
@@ -191,8 +191,11 @@ SERVERLOOP: foreach my $serverpath (@ser
   {
     $serverpath=~/^(.*?)\//; # Pattern match the ip name.
     $FTPSERVER=$1; # Set to the ip name.
-    print($out "Trying $FTPSERVER...\n"); # Notify of attempts with ip name.
-    `ping -c 1 $FTPSERVER 2>/dev/null`; # Ping ftp server (are you out there?).
+    $FTPSERVER_noauth=$FTPSERVER;
+    $FTPSERVER_noauth=~s/^.*?\@//;
+    print($out
+	  "Trying $FTPSERVER_noauth...\n"); # Notify of attempts with ip name.
+    `ping -c 1 -w 10 $FTPSERVER_noauth 2>/dev/null`;#Ping ftp server (u there?)
     if ($?==0) # If the ftp server can be pinged.
       {
 	print($out "$FTPSERVER found...\n"); # Tell user ftp server is found.
@@ -318,6 +321,7 @@ sub clean_exit
     if ($mode eq 'cronmail') # If cronmail mode, then mail LON-CAPA sys admin.
       {
         close(FOUT);
+
 	# Read in configuration to get e-mail addresses.
 	my $perlvarref = read_conf('loncapa.conf');
 	my %perlvar = %{$perlvarref};
@@ -326,12 +330,32 @@ sub clean_exit
 	delete $perlvar{'lonSqlAccess'}; # remove since sensitive
 
 	# Set metadata for the e-mail.
-        my $emailto = "$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
-#	my $emailto = "sharrison\@users.sourceforge.net";
-	my $subj="LON: $perlvar{'lonHostID'}, RPMS to upgrade";
-	system(
-	       'metasend -b -t '.$emailto.' -s '.
-	       "'$subj' -f /tmp/CHECKRPMS.$$ -m text/plain");
+        my $emailto = "$perlvar{'lonAdmEMail'}";
+
+	my $subj=$perlvar{'lonHostID'}.', RPMS to upgrade';
+
+	# Make the e-mail's subject header to describe whether up-to-date.
+	if ($reallygoodoutput)
+	  {
+	    $subj = 'happy_lon: '.$subj; # Machine is up-to-date.
+	  }
+	else
+	  {
+	    $subj = 'ALERT_lon: '.$subj; # There are out-of-date RPMs.
+	  }
+
+	# Send the e-mail.
+	my $date = `date +"\%e"`; # Always send a day after the "Ides" or after
+	                          # the beginning of a month.  (In other words,
+	                          # send an e-mail every two weeks regardless.)
+        if (!$reallygoodoutput or
+	    $date == 2 or
+	    $date == 16)
+	  {
+	    system(
+		   'metasend -b -t '.$emailto.' -s '.
+		   "'$subj' -f /tmp/CHECKRPMS.$$ -m text/plain");
+	  }
       }
 
     print($out <<END) if $mode eq 'html'; # If html mode, print ending tags.