From f433088d5a51ee423ba3f6fa38f1280aaafbf6f4 Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Thu, 27 Oct 2011 12:47:05 +0200
Subject: [PATCH] MDL-29474 fix regressions in CLI install

---
 admin/cli/install.php | 33 ++++++++++++++++++++-------------
 lang/en/install.php   |  3 ++-
 lib/pluginlib.php     | 21 ++++++++++++++++++---
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/admin/cli/install.php b/admin/cli/install.php
index 59ffe5d7d5ef4..68ed892f46732 100644
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -20,7 +20,6 @@
  *
  * This script is not intended for beginners!
  * Potential problems:
- * - environment check is not present yet
  * - su to apache account or sudo before execution
  * - not compatible with Windows platform
  *
@@ -91,7 +90,11 @@
         echo "\n\n";
     }
 
-    cli_error(get_string('clialreadyinstalled', 'install'));
+    if ($DB->get_manager()->table_exists('config')) {
+        cli_error(get_string('clialreadyinstalled', 'install'));
+    } else {
+        cli_error(get_string('clialreadyconfigured', 'install'));
+    }
 }
 
 $olddir = getcwd();
@@ -636,7 +639,21 @@
     cli_error('Can not create config file.');
 }
 
+// remember selected language
+$installlang = $CFG->lang;
+// return back to original dir before executing setup.php which changes the dir again
+chdir($olddir);
+// We have config.php, it is a real php script from now on :-)
+require($configfile);
+
+// use selected language
+$CFG->lang = $installlang;
+$SESSION->lang = $CFG->lang;
+
+require("$CFG->dirroot/version.php");
+
 // Test environment first.
+require_once($CFG->libdir . '/environmentlib.php');
 list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
 if (!$envstatus) {
     $errors = environment_get_errors($environment_results);
@@ -649,21 +666,11 @@
 }
 
 // Test plugin dependencies.
+require_once($CFG->libdir . '/pluginlib.php');
 if (!plugin_manager::instance()->all_plugins_ok($version)) {
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
-// remember selected language
-$installlang = $CFG->lang;
-// return back to original dir before executing setup.php which changes the dir again
-chdir($olddir);
-// We have config.php, it is a real php script from now on :-)
-require($configfile);
-
-// use selected language
-$CFG->lang = $installlang;
-$SESSION->lang = $CFG->lang;
-
 install_cli_database($options, $interactive);
 
 echo get_string('cliinstallfinished', 'install')."\n";
diff --git a/lang/en/install.php b/lang/en/install.php
index 4e0ab7ef9c181..cdaaa0cfa3181 100644
--- a/lang/en/install.php
+++ b/lang/en/install.php
@@ -42,7 +42,8 @@
 $string['caution'] = 'Caution';
 $string['cliadminpassword'] = 'New admin user password';
 $string['cliadminusername'] = 'Admin account username';
-$string['clialreadyinstalled'] = 'File config.php already exists, please use admin/cli/upgrade.php if you want to upgrade your site.';
+$string['clialreadyconfigured'] = 'File config.php already exists, please use admin/cli/install_database.php if you want to install this site.';
+$string['clialreadyinstalled'] = 'File config.php already exists, please use admin/cli/upgrade.php if you want to upgrade this site.';
 $string['cliinstallfinished'] = 'Installation completed successfully.';
 $string['cliinstallheader'] = 'Moodle {$a} command line installation program';
 $string['climustagreelicense'] = 'In non interactive mode you must agree to license by specifying --agree-license option';
diff --git a/lib/pluginlib.php b/lib/pluginlib.php
index 91733105d97b0..02719a771ae6d 100644
--- a/lib/pluginlib.php
+++ b/lib/pluginlib.php
@@ -851,7 +851,12 @@ protected function get_version_from_config_plugins($plugin, $disablecache=false)
         static $pluginversions = null;
 
         if (is_null($pluginversions) or $disablecache) {
-            $pluginversions = $DB->get_records_menu('config_plugins', array('name' => 'version'), 'plugin', 'plugin,value');
+            try {
+                $pluginversions = $DB->get_records_menu('config_plugins', array('name' => 'version'), 'plugin', 'plugin,value');
+            } catch (dml_exception $e) {
+                // before install
+                $pluginversions = array();
+            }
         }
 
         if (!array_key_exists($plugin, $pluginversions)) {
@@ -989,7 +994,12 @@ protected static function get_blocks_info($disablecache=false) {
         static $blocksinfocache = null;
 
         if (is_null($blocksinfocache) or $disablecache) {
-            $blocksinfocache = $DB->get_records('block', null, 'name', 'name,id,version,visible');
+            try {
+                $blocksinfocache = $DB->get_records('block', null, 'name', 'name,id,version,visible');
+            } catch (dml_exception $e) {
+                // before install
+                $blocksinfocache = array();
+            }
         }
 
         return $blocksinfocache;
@@ -1318,7 +1328,12 @@ protected static function get_modules_info($disablecache=false) {
         static $modulesinfocache = null;
 
         if (is_null($modulesinfocache) or $disablecache) {
-            $modulesinfocache = $DB->get_records('modules', null, 'name', 'name,id,version,visible');
+            try {
+                $modulesinfocache = $DB->get_records('modules', null, 'name', 'name,id,version,visible');
+            } catch (dml_exception $e) {
+                // before install
+                $modulesinfocache = array();
+            }
         }
 
         return $modulesinfocache;