summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README19
-rw-r--r--installer/cli.php8
-rw-r--r--installer/index.php9
3 files changed, 21 insertions, 15 deletions
diff --git a/README b/README
index 9436df48..e18b2637 100644
--- a/README
+++ b/README
@@ -1,8 +1,17 @@
-To get started, point your browser at the gallery3 dir. That should
-take you to the scaffolding page which will walk you through the
-process of getting installed. Questions, problems?
+INSTALLING VIA THE WEB
+- Point your web browser at gallery3/installer and follow the instructions
-Check out the gallery3 FAQ http://codex.gallery2.org/Gallery3:FAQ, or
-Send an email to gallery-devel@lists.sourceforge.net.
+INSTALLING FROM THE COMMAND LINE
+- php installer/index.php [-h host] [-u user] [-p pass] [-d dbname]
+
+ Command line parameters:
+ -h Database host (default: localhost)
+ -u Database user (default: root)
+ -p Database user password (default: )
+ -d Database name (default: gallery3)
+
+Questions, problems:
+ - Check out the gallery3 FAQ http://codex.gallery2.org/Gallery3:FAQ
+ - Email gallery-devel@lists.sourceforge.net
diff --git a/installer/cli.php b/installer/cli.php
index bff9c16c..2d539f17 100644
--- a/installer/cli.php
+++ b/installer/cli.php
@@ -17,7 +17,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
+/**
+ * Command line parameters:
+ * -h Database host (default: localhost)
+ * -u Database user (default: root)
+ * -p Database user password (default: )
+ * -d Database name (default: gallery3)
+ */
if (installer::already_installed()) {
print "Gallery 3 is already installed.\n";
return;
diff --git a/installer/index.php b/installer/index.php
index 27faf1b6..a54790c9 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -17,15 +17,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/**
- * The main install program to install Gallery3.
- * Command line parameters:
- * -h Database host (default: localhost)
- * -u Database user (default: root)
- * -p Database user password (default: )
- * -d Database name (default: gallery3)
- * -t Table prefix (default: )
- */
define("DOCROOT", dirname(dirname(__FILE__)) . "/");
define("VARPATH", DOCROOT . "var/");
define("SYSPATH", "DEFINED_TO_SOMETHING_SO_THAT_WE_CAN_KEEP_CONSISTENT_PREAMBLES_IN_THE_INSTALLER");