Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the installer when using "other" #190

Merged
merged 5 commits into from
Oct 6, 2022
Merged

Fix the installer when using "other" #190

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23a8043
add drupal.root value default
byrond Jul 27, 2022
5f4bbf4
detect docroot directory first
byrond Jul 27, 2022
60e48f0
check for core subdir to determine old drupal root
byrond Jul 27, 2022
59d7a01
allow rm docroot to fail
byrond Jul 28, 2022
bcdadf9
If there's already a .the-build/build.yml file, allow changing the dr…
becw Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions targets/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,17 @@
that can vary, especially around the host-specific settings.php files. -->
<switch value="${build.host}">
<case value="acquia">
<property name="drupal.root" value="docroot" />
<property name="drupal.root" value="docroot" override="true" />
</case>
<case value="pantheon">
<property name="drupal.root" value="web" />
<property name="drupal.root" value="web" override="true" />
</case>
<case value="platformsh">
<property name="drupal.root" value="web" />
<property name="drupal.root" value="web" override="true" />
</case>
<default />
<default>
<property name="drupal.root" value="web" override="true" />
</default>
</switch>

<!-- Load the defaults into the global namespace, which won't overwrite the properties the user just set. -->
Expand Down Expand Up @@ -132,16 +134,17 @@
If the drupal.root directory doesn't exist, then we need to move it from the other location (web /
docroot).-->
<target name="setup-web-root" depends="set-site">
<available file="${build.dir}/${drupal.root}" type="dir" property="drupal.root.exists" value="true" />
<available file="${build.dir}/${drupal.root}/core" type="dir" property="drupal.root.exists" value="true" />

<if>
<not><equals arg1="${drupal.root.exists}" arg2="1" /></not>
<then>
<!-- The one that's available is the location we're moving from. -->
<available file="${build.dir}/web" type="dir" property="drupal.root.old" value="web" />
<available file="${build.dir}/docroot" type="dir" property="drupal.root.old" value="docroot" />
<available file="${build.dir}/web/core" type="dir" property="drupal.root.old" value="web" />
<available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />

<echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
<exec command="rm -rf ${drupal.root}" dir="${build.dir}" />
<exec command="mv ${drupal.root.old} ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />

<echo msg="Editing your composer.json to install Drupal in ${drupal.root}/" />
Expand Down