From 6a17669a8e4a40a7986a8849e9424e773f48e29d Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Thu, 9 Sep 2021 11:55:29 -0500
Subject: [PATCH] Set the site name property as part of the build installer
 process, so that you don't end up with 'html' when you install from within
 ddev.

---
 defaults.yml                         | 5 +++--
 defaults/install/the-build/build.yml | 2 ++
 targets/install.xml                  | 5 +++++
 targets/the-build.xml                | 5 ++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/defaults.yml b/defaults.yml
index 1823997f..79c45968 100644
--- a/defaults.yml
+++ b/defaults.yml
@@ -53,8 +53,9 @@ drupal:
       dir: default
 
       # REQUIRED: Your site's URI; the default should be the URI of your local
-      # development environment.
-      uri: "https://${projectname}.ddev.site"
+      # development environment. This must be present in your
+      # .the-build/build.yml file.
+#      uri: "https://${projectname}.ddev.site"
 
       # Customizing the following values is OPTIONAL. If these values are not
       # explicitly configured, they will be set in the-build.xml based on the
diff --git a/defaults/install/the-build/build.yml b/defaults/install/the-build/build.yml
index e50c19cc..29486bb0 100644
--- a/defaults/install/the-build/build.yml
+++ b/defaults/install/the-build/build.yml
@@ -5,6 +5,8 @@
 # found in the-build's repository.
 # @see https://github.com/palantirnet/the-build/blob/release-2.0/defaults.yml
 
+projectname: ${projectname}
+
 # These properties are used when building the settings.php and settings.yml for your
 # Drupal site, and by some of the targets in the default build.xml file.
 # @see .the-build/drupal/services.build.yml
diff --git a/targets/install.xml b/targets/install.xml
index 84479d7f..3796640e 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -44,7 +44,12 @@
         <mkdir dir="${application.startdir}/config" />
         <echo message="${hash_salt}" file="${application.startdir}/config/salt.txt" />
 
+        <!-- Prompt for the site name. -->
+        <propertyprompt propertyName="projectname.new" defaultValue="${projectname}" promptText="Machine name for this project" promptCharacter=":" />
+        <property name="projectname" value="${projectname.new}" override="true" />
+
         <!-- Prompt for the Drupal URI. -->
+        <property name="default.drupal.sites.default.uri" value="https://${projectname}.ddev.site" />
         <propertyprompt propertyName="drupal.sites.default.uri" defaultValue="${default.drupal.sites.default.uri}" promptText="Drupal URI" promptCharacter=":" />
 
         <!-- Prompt for the web host. -->
diff --git a/targets/the-build.xml b/targets/the-build.xml
index 53e0038f..da0a7e57 100644
--- a/targets/the-build.xml
+++ b/targets/the-build.xml
@@ -34,9 +34,6 @@
     <!-- Alias the build directory to the Phing start directory. -->
     <property name="build.dir" value="${application.startdir}" />
 
-    <!-- Use the project directory name as the project name -->
-    <basename property="projectname" file="${build.dir}" suffix="local" />
-
     <!-- Provide the path to the-build's code for loading templates and defaults -->
     <!-- Phing maps the project name "the-build" to "the_build". -->
     <resolvepath file="${phing.dir.the_build}/../" propertyName="build.thebuild.dir" />
@@ -87,6 +84,8 @@
         </then>
     </if>
 
+    <!-- Use the project directory name as the project name, if it's not configured. -->
+    <basename property="projectname" file="${build.dir}" suffix="local" />
 
     <!-- Configure the 'drush' Phing task. -->
     <property name="drush.bin" value="${build.dir}/vendor/bin/drush" />