From 817c6494034b15c3aa3e46d0c214c29bf50eaf35 Mon Sep 17 00:00:00 2001
From: pate <pate>
Date: Fri, 26 Apr 2002 14:47:17 +0000
Subject: [PATCH] more markup of spots to look at

---
 installer.pl | 57 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/installer.pl b/installer.pl
index 15f9831aa2..2b80e1dbea 100644
--- a/installer.pl
+++ b/installer.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w # please develop with -w
 
+
 use strict; # please develop with the strict pragma
 
 print <<EOM;
@@ -12,7 +13,7 @@ print <<EOM;
 
 This installer will prompt you with a series of questions.
 It assumes you (or your system administrator) has installed:
-  * Apache (http://www.apache.org)
+  * Apache (http://httpd.apache.org/)
   * Perl (http://www.perl.org)
 
 
@@ -24,8 +25,8 @@ on some type of Unix or Unix-like operating system
 
 
 
-Is Apache, Perl, and a database from the list above installed on this system?
-
+Are Apache, Perl, and a database from the list above installed 
+on this system? (Y/[N]):
 EOM
 
 my $answer = $_;                      
@@ -42,6 +43,11 @@ EOM
     exit(1);
   };
 
+
+#
+#  Hmm, on further thought, this file came out of the tarball ... so
+#  is it likely to be untarred again?
+#
 print "I need to unpack the Koha TarFile -- where is it?  ";
 $answer = $_;
 chomp $answer;    
@@ -52,21 +58,21 @@ system("tar -x $answer"); #unpack fill out
 
 
 #test for Perl and Apache?
-print "Are you using MySql?[Y/N]: ";
+print "Are you using MySql?(Y/[N]): ";
 $answer = $_;                      
 chomp $answer
-if ($answer eq "Y") { 
-	system("mysqladmin -uroot -ppassword create $KohaDBNAME ");
-	system("mysql -u$root -p$password ");
-	#need to get to mysql prompt  HOW DO I DO THIS?
-
-	# FIXME 
-	# you could pipe this into mysql in the shell that system generates
-	# can this be done from dbi?
-	system("grant all privileges on Koha.* to koha@localhost identified by 'kohapassword'; ");
-
-  };
-if ($answer eq "N") {
+if ($answer eq "Y" || $answer eq "y") {
+    # FIXME
+    # there is no $password or $KohaDBNAME yet
+    system("mysqladmin -uroot -p$password create $KohaDBNAME ");
+    system("mysql -u$root -p$password ");
+    #need to get to mysql prompt  HOW DO I DO THIS?
+    
+    # FIXME 
+    # you could pipe this into mysql in the shell that system generates
+    # can this be done from dbi?
+    system("grant all privileges on Koha.* to koha@localhost identified by 'kohapassword'; ");
+} else {
     print <<EOM;
 You will need to use the MySQL database system for your application.
 The installer currently does not support an automated setup with this database.
@@ -74,12 +80,21 @@ EOM
   };
 
 print "\n";
+#
+# FIXME
+# there is no updatedatabase program yet
+#
 system ("perl updatedatabase -I /pathtoC4 ");
 
 #KOHA conf
+
 # FIXME
 # is there a reason we don't just create the conf file here?
-
+# We could ask where the file is to be kept, update our 
+# scripts to look for it there, and just write out to the
+# new file (possibly allowing the installer.pl user to edit the
+# file first).
+#
 print <<EOM;
 You will need to add the following to the Koha configuration file\n";
 database=Koha\n";
@@ -89,6 +104,14 @@ pass=$password\n";
 includes=/usr/local/www/koha/htdocs/includes\n";
 EOM
 
+
+# FIXME
+# Again, this may be something to automate.  We could ask a 
+# series of questions, then fill out a form with the answers and 
+# edit the existing config file in place.  (Again, giving the
+# installer.pl user a chance to edit the file first.)
+#
+
 #SETUP opac
 #   <VirtualHost opac.your.site>                         
 #   ServerAdmin webmaster@your.site                            
-- 
2.20.1