Changeset 1171 for branches

Timestamp:

06/21/08 18:15:43 (7 months ago)

Author:

kake

Message:

Make it clear in SETUP that the script_url needs an http

Location:

branches/new-install-process

Files:

• SETUP (modified) (1 diff)
• bin/openguides-install (modified) (7 diffs)

branches/new-install-process/SETUP

@@ -174 +174 @@
 
 Give the full address needed to access the installation directory with
-a web browser - for example http://london.openguides.org/
+a web browser, including the "http://" prefix - for example,
+http://london.openguides.org/
 
 

branches/new-install-process/bin/openguides-install

@@ -79 +79 @@
 }
 
-# The database setup script.
-my $setup = find_script( "wiki-toolkit-setupdb" );
-
 my $force;
 GetOptions('force' => \$force);
@@ -116 +113 @@
       content_above_navbar_in_html show_gmap_in_node_display force_wgs84
       send_moderation_notifications);
+
+my %blank_ok = map { $_ => 1 }
+   qw( dbpass dbhost );
 
 my $skip_config = $force ? 'y'
@@ -167 +167 @@
               );
 eval "require $drivers{$dbtype}";
-warn "$drivers{$dbtype} is needed to run a $dbtype database" if $@;
+die "\nSorry; $drivers{$dbtype} is needed to run a $dbtype database - please "
+    . "install this\nmodule and try again.\n\n" if $@;
 
 push @answers, { question => $dbtype_qu,
@@ -206 +207 @@
     my $q_method = $var . "__qu";
     my $qu  = $existing_config->$q_method;
-    my $type = $yn_vars{$var} ? "y_n" : "";
     my $def = $existing_config->$var || "";
     my $val = $def;
@@ -212 +212 @@
     # Override dbname question for SQLite only.
     if ( $dbtype eq "sqlite" and $var eq "dbname" ) {
-        $qu = "what's the full filename of the SQLite database this site runs on?";
+        $qu = "What's the full filename of the SQLite database this site runs on?";
     }
 
@@ -323 +323 @@
     # Here is where we actually ask the questions.
     unless ( $skip_config ) {
-        if ( $type eq "y_n" ) {
+print $var . "\n";
+        if ( $yn_vars{$var} ) {
             # may be stored as true/false integer value
             if ( $def =~ /^\d+$/ ) {
@@ -329 +330 @@
             }
             $val = prompt( "y", $qu, "y or n", $def );
+        } elsif ( $blank_ok{$var} ) {
+print "boo!\n";
+             $val = prompt( "s", $qu, "optional", $def,
+                            sub { print "hello!\n"; return 1; } );
         } else {
              $val = prompt( "x", $qu, "", $def );