--- doc/install/redhat7.3/install.pl	2002/06/19 19:27:17	1.2
+++ doc/install/redhat7.3/install.pl	2002/07/22 14:23:04	1.7
@@ -2,7 +2,7 @@
 # The LearningOnline Network 
 # Red Hat 7.3 installation script
 #
-# $Id: install.pl,v 1.2 2002/06/19 19:27:17 matthew Exp $
+# $Id: install.pl,v 1.7 2002/07/22 14:23:04 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,9 @@
 #    The following files are assumed to be present in the current
 #    directory:
 #      RPMS:
+#        ImageMagick-5.4.3.11-1.i386.rpm
+#        ImageMagick-devel-5.4.3.11-1.i386.rpm
+#        ImageMagick-perl-5.4.3.11-1.i386.rpm
 #        gnuplot-3.7.1-5.i386.rpm
 #        libgd-1.3-4.i386.rpm
 #        libungif-progs-4.1.0-9.i386.rpm
@@ -159,6 +162,27 @@ chomp($instdir);
 # This list of rpms needs to be pared down to some extent.
 #
 
+my @apache_rpms = (
+             "$instdir/apache-1.3.23-14.i386.rpm"
+                   );
+
+my @openssh_rpms = (
+             "$instdir/openssh-3.1p1-6.i386.rpm",
+             "$instdir/openssh-askpass-3.1p1-6.i386.rpm",
+             "$instdir/openssh-clients-3.1p1-6.i386.rpm",
+             "$instdir/openssh-server-3.1p1-6.i386.rpm"
+                );
+# Check for gnome-askpass installation.
+if (-e "/etc/profile.d/gnome-ssh-askpass.sh") {
+    push @openssh_rpms,"$instdir/openssh-askpass-gnome-3.1p1-6.i386.rpm";
+}
+
+my @ImageMagick_rpms = (
+             "$instdir/ImageMagick-5.4.3.11-1.i386.rpm",
+             "$instdir/ImageMagick-devel-5.4.3.11-1.i386.rpm",
+             "$instdir/ImageMagick-perl-5.4.3.11-1.i386.rpm",
+                       );
+
 my @gnuplot_rpms = (
              "$instdir/gnuplot-3.7.1-5.i386.rpm",
              "$instdir/libgd-1.3-4.i386.rpm",
@@ -191,6 +215,14 @@ my @misc_rpms = (
 ## but it is an exercise in frustration.  It would be nice to be kind, but
 ## frankly I do not want to spend the time to figure this out.
 ##
+
+print_and_log("Installing Apache packages.\n");
+writelog (`rpm -Uvh @apache_rpms`);
+print_and_log("Installing openssh packages.\n");
+writelog (`rpm -Uvh @openssh_rpms`);
+system("/etc/init.d/sshd start");
+print_and_log("Installing ImageMagick packages.\n");
+writelog (`rpm -ivh --force --nodeps @ImageMagick_rpms`);
 print_and_log("Installing mysql packages.\n");
 writelog (`rpm -ivh --force --nodeps @mysql_rpms`);
 print_and_log("Installing gnuplot packages.\n");
@@ -201,7 +233,6 @@ print_and_log("Installing Perl packages.
 writelog (`rpm -ivh --force --nodeps @perl_rpms`);
 print_and_log("Installing misc packages.\n");
 writelog (`rpm -ivh --force --nodeps @misc_rpms`);
-system("/etc/init.d/sshd start");
 print_and_log("\n");
 
 ##
@@ -304,8 +335,11 @@ writelog("mysql links created successful
 writelog(`/etc/rc.d/init.d/mysqld start`);
 print_and_log("Waiting for mysql daemon to start.\n");
 sleep 5;
-if (`/etc/rc.d/init.d/mysqld status` !~ / is running/) {
+my $status = system("/etc/rc.d/init.d/mysqld status");
+if ($status != 0) {
     die "Unable to start mysql daemon\nHalting\n";
+} else {
+    print_and_log("Mysql daemon is running.\n");
 }
 print_and_log("\n");
 
@@ -391,23 +425,23 @@ print_and_log("\n");
 ##
 ## Retrieve loncapa.tar.gz
 ##
-if (! -e "$instdir/loncapa.tar.gz") {
+if (! -e "$instdir/loncapa-current.tar.gz") {
     print_and_log("Retrieving LON-CAPA source files from install.loncapa.org\n");
-    system("wget http://install.loncapa.org/versions/current/loncapa.tar.gz 2>/dev/null 1>/dev/null");
-    if (! -e "./loncapa.tar.gz") {
+    system("wget http://install.loncapa.org/versions/loncapa-current.tar.gz 2>/dev/null 1>/dev/null");
+    if (! -e "./loncapa-current.tar.gz") {
         die("Unable to retrieve LON-CAPA source files from\n".
-            "http://install.loncapa.org/versions/current/loncapa.tar.gz\n");
+            "http://install.loncapa.org/versions/loncapa-current.tar.gz\n");
     }
     print_and_log("\n");
 } else {
     print_and_log(<<"END");
 ------------------------------------------------------------------------
 
-You seem to have a version of loncapa.tar.gz in $instdir.  
+You seem to have a version of loncapa-current.tar.gz in $instdir.  
 This copy will be used and a new version will NOT be downloaded.  
 If you wish, you may download a new version by executing:
 
-wget http://install.loncapa.org/versions/current/loncapa.tar.gz
+wget http://install.loncapa.org/versions/loncapa-current.tar.gz
 
 ------------------------------------------------------------------------
 END
@@ -417,7 +451,7 @@ END
 ## untar loncapa.tar.gz
 ##
 print_and_log("Extracting LON-CAPA source files\n");
-writelog(`cd ~root; tar zxf $instdir/loncapa.tar.gz`);
+writelog(`cd ~root; tar zxf $instdir/loncapa-current.tar.gz`);
 print_and_log("\n");
 
 my $version = `cat /etc/redhat-release`;
@@ -428,7 +462,7 @@ commands now:
 rpm -Uvh perl-5.6.1-34.99.6.i386.rpm
 rpm -Uvh perl-CGI-2.752-34.99.6.i386.rpm
 
-cd /root/loncapa
+cd /root/loncapa-N.N     (N.N should correspond to a version number like '0.4')
 ./UPDATE
 
 END
@@ -440,12 +474,13 @@ END
 All of the extra files seem to have been installed correctly.  It remains for 
 you to execute the following commands:
 
-cd /root/loncapa;
+cd /root/loncapa-N.N     (N.N should correspond to a version number like '0.4')
 ./UPDATE
 
-If you have any trouble, please see http://install.loncapa.org and 
-http://help.loncapa.org.  
+If you have any trouble, please see http://install.loncapa.org/ and 
+http://help.loncapa.org/.  
 ENDMSG
 }
 
 close LOG;
+