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 # 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/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> # vendor/bin/behat @<module>
# ========================================================================= # # ========================================================================= #
default: default:
@ -16,6 +16,6 @@ default:
selenium2: selenium2:
browser: firefox browser: firefox
SilverStripe\BehatExtension\Extension: 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 screenshot_path: %paths.base%/artifacts/screenshots
retry_seconds: 4 # default is 2 retry_seconds: 4 # default is 2

2
install-frameworkmissing.html
View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title>The SilverStripe Framework is missing</title> <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> </head>
<body> <body>
<div id="BgContainer"> <div id="BgContainer">

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'; include 'install-frameworkmissing.html';
} else { } else {
include './framework/src/Dev/Install/install.php'; include './vendor/silverstripe/framework/src/Dev/Install/install.php';
} }