tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Fix main.php path

Browse Source
This commit is contained in:
Ingo Schommer 2017-10-03 01:44:14 +13:00
parent f22d9b3735
commit e88f7654da
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
behat.yml
View File

@ -4,7 +4,7 @@
# ========================================================================= #
# composer require silverstripe/behat-extension:^3 silverstripe/serve:dev-master se/selenium-server-standalone:2.41.0
# vendor/bin/selenium-server-standalone -Dwebdriver.firefox.bin="/Applications/Firefox31.app/Contents/MacOS/firefox-bin"
# vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php
# vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
# vendor/bin/behat @<module>
# ========================================================================= #
default:
@ -16,6 +16,6 @@ default:
selenium2:
browser: firefox
SilverStripe\BehatExtension\Extension:
bootstrap_file: cms/tests/behat/serve-bootstrap.php
bootstrap_file: vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
screenshot_path: %paths.base%/artifacts/screenshots
retry_seconds: 4 # default is 2

10
install-frameworkmissing.html
View File

@ -1,7 +1,7 @@
<html>
<head>
<title>The SilverStripe Framework is missing</title>
<link rel="stylesheet" type="text/css" href="framework/dev/install/css/install.css" />
<link rel="stylesheet" type="text/css" href="<?=$clientPath; ?>/styles/install.css" />
</head>
<body>
<div id="BgContainer">
@ -9,14 +9,14 @@
<div id="Header">
<h1>SilverStripe CMS Installation</h1>
</div>
<div id="Navigation">&nbsp;</div>
<div class="clear"><!-- --></div>
<div id="Layout">
<div class="typography">
<p><strong>The SilverStripe Framework is missing</strong> - To run the installer, at least the <strong>framework</strong> module is required.</p>
<p>If you downloaded a pre-packaged zip or tar.gz, something might have gone wrong with the packaging
process. Please try re-downloading, or try an older version.</p>
@ -25,7 +25,7 @@
</div>
<div class="clear"><!-- --></div>
</div>
<div id="Footer">
<div class="footerTop"><!-- --></div>
<p><a href="http://silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008-2011 SilverStripe Limited</p>

4
install.php
View File

@ -9,8 +9,8 @@
************************************************************************************
************************************************************************************/
if (!file_exists('framework') || !file_exists('framework/_config.php')) {
if (!file_exists('vendor/silverstripe/framework') || !file_exists('vendor/silverstripe/framework/_config.php')) {
include 'install-frameworkmissing.html';
} else {
include './framework/src/Dev/Install/install.php';
include './vendor/silverstripe/framework/src/Dev/Install/install.php';
}