From 096fd59653d33bd6a75e4edd8b86e71e954b149a Mon Sep 17 00:00:00 2001
From: Charles Fulton <mackensen@gmail.com>
Date: Thu, 26 Jun 2014 14:27:07 -0700
Subject: [PATCH] MDL-46167 admin_cli: allow skipping of database installation

---
 admin/cli/install.php | 8 +++++++-
 lang/en/install.php   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/admin/cli/install.php b/admin/cli/install.php
index e43430eccd30c..131056d7e67e7 100644
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -80,6 +80,7 @@
                       required in non-interactive mode.
 --allow-unstable      Install even if the version is not marked as stable yet,
                       required in non-interactive mode.
+--skip-database       Stop the installation before installing the database.
 -h, --help            Print out this help
 
 Example:
@@ -260,6 +261,7 @@
         'non-interactive'   => false,
         'agree-license'     => false,
         'allow-unstable'    => false,
+        'skip-database'     => false,
         'help'              => false
     ),
     array(
@@ -772,7 +774,11 @@
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
-install_cli_database($options, $interactive);
+if (!$options['skip-database']) {
+    install_cli_database($options, $interactive);
+} else {
+    echo get_string('cliskipdatabase', 'install')."\n";
+}
 
 echo get_string('cliinstallfinished', 'install')."\n";
 exit(0); // 0 means success
diff --git a/lang/en/install.php b/lang/en/install.php
index 3d846950cb096..5386298593477 100644
--- a/lang/en/install.php
+++ b/lang/en/install.php
@@ -47,6 +47,7 @@
 $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';
+$string['cliskipdatabase'] = 'Skipping database installation.';
 $string['clitablesexist'] = 'Database tables already present, cli installation can not continue.';
 $string['compatibilitysettings'] = 'Checking your PHP settings ...';
 $string['compatibilitysettingshead'] = 'Checking your PHP settings ...';