diff --git a/install.php b/install.php index 4782c336..139e38a4 100644 --- a/install.php +++ b/install.php @@ -3,28 +3,32 @@ * Shimmie Installer * * @package Shimmie - * @author Shish et al. + * @copyright Copyright (c) 2007-2014, Shish et al. + * @author Shish , jgen * @link http://code.shishnet.org/shimmie2/ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 - * @copyright Copyright (c) 2007-2014, Shish et al. + * */ // TODO: Rewrite the entire installer and make it more readable. ob_start(); +/* + +*/ ?> - + Shimmie Installation @@ -37,7 +41,7 @@ ob_start();

Install Error

Shimmie needs to be run via a web server with PHP support -- you appear to be either opening the file from your hard disk, or your - web server is mis-configured.

+ web server is mis-configured and doesn't know how to handle PHP files.

If you've installed a web server on your desktop PC, you probably want to visit the local web server.

@@ -454,7 +458,7 @@ function write_config() { // {{{

-

Once done, Continue +

Once done, Click here to Continue.

EOD; diff --git a/tests/setup_test_env.sh b/tests/setup_test_env.sh index 1717cd2c..6d10f804 100644 --- a/tests/setup_test_env.sh +++ b/tests/setup_test_env.sh @@ -11,7 +11,7 @@ set -e # Install the necessary packages -sudo apt-get install -y nginx php5-fpm php5-mysql realpath --fix-missing +sudo apt-get install -y nginx php5-fpm php5-mysql php5-pgsql realpath --fix-missing # Stop the daemons sudo service nginx stop