diff --git a/core/install.php b/core/install.php index 4175e305..5fe80f06 100644 --- a/core/install.php +++ b/core/install.php @@ -26,17 +26,6 @@ function install() ); } - if (!file_exists("vendor/")) { - exit_with_page("Install Error", " -

Shimmie is unable to find the composer vendor directory.

-

Have you followed the composer setup instructions found in the - README?

-

If you are not intending to do any development with Shimmie, - it is highly recommend you use one of the pre-packaged releases - found on Github instead.

- "); - } - // Pull in necessary files require_once "vendor/autoload.php"; global $_tracer; diff --git a/index.php b/index.php index f35aea12..545c37ca 100644 --- a/index.php +++ b/index.php @@ -3,14 +3,7 @@ * Make sure that shimmie is correctly installed * \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -if (!file_exists("data/config/shimmie.conf.php")) { - require_once "core/install.php"; - install(); - exit; -} - if (!file_exists("vendor/")) { - //CHECK: Should we just point to install.php instead? Seems unsafe though. print << @@ -24,13 +17,9 @@ if (!file_exists("vendor/")) {

Install Error

Warning: Composer vendor folder does not exist!

-

Shimmie is unable to find the composer vendor directory.
- Have you followed the composer setup instructions found in the - README?

- -

If you are not intending to do any development with Shimmie, - it is highly recommend you use one of the pre-packaged releases - found on Github instead.

+

Shimmie is unable to find the composer vendor directory. +
To finish installing, you need to run composer install + in the shimmie directory.

@@ -40,6 +29,12 @@ EOD; exit; } +if (!file_exists("data/config/shimmie.conf.php")) { + require_once "core/install.php"; + install(); + exit; +} + require_once "vendor/autoload.php";