From cbf3338be4128dcde84ccab1ae763a6d167c6637 Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Tue, 30 Jul 2024 11:02:36 -0600
Subject: [PATCH] Can't do yaml_read_files with rooted path

---
 install.yaml      | 8 ++++----
 tests/per_test.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install.yaml b/install.yaml
index 5fde86d..03b20ce 100644
--- a/install.yaml
+++ b/install.yaml
@@ -225,7 +225,7 @@ post_install_actions:
       {{ end }}
     {{ else if hasKey $supported_services $service_def.type }}
       {{/* Other services */}}
-      relationships+=($(${DDEV_APPROOT/.ddev/platformsh/generate_{{ $service_def.type }}_relationship.sh '{{ $relationship_name }}' | ${BASE64_ENCODE}))
+      relationships+=($(${DDEV_APPROOT}/.ddev/platformsh/generate_{{ $service_def.type }}_relationship.sh '{{ $relationship_name }}' | ${BASE64_ENCODE}))
       {{ $service_addon := get $supported_services $service_def.type }}
       {{ if $service_addon }}
         echo "Running 'ddev get {{ $service_addon }}'"
@@ -328,7 +328,7 @@ post_install_actions:
   ENDOFHOOKS
 
 yaml_read_files:
-  platformapp: ${DDEV_APPROOT}/.platform.app.yaml
-  services: ${DDEV_APPROOT}/.platform/services.yaml
-  routes: ${DDEV_APPROOT}/.platform/routes.yaml
+  platformapp: .platform.app.yaml
+  services: .platform/services.yaml
+  routes: .platform/routes.yaml
 
diff --git a/tests/per_test.sh b/tests/per_test.sh
index 2cbf94d..d1edf9a 100644
--- a/tests/per_test.sh
+++ b/tests/per_test.sh
@@ -10,7 +10,7 @@ per_test_setup() {
   # If the template happens to have a .ddev directory, remove as it can break things
   rm -rf .ddev
   # Start with bogus settings so we know we got the right stuff when testing
-  ddev config --project-name=${PROJNAME} --php-version=5.6 --database=mariadb:10.1 --docroot=x --create-docroot --project-type=php --web-environment-add=PLATFORMSH_CLI_TOKEN=notokenrightnow,PLATFORM_PROJECT=notyet,PLATFORM_ENVIRONMENT=notyet
+  ddev config --project-name=${PROJNAME} --php-version=5.6 --database=mariadb:10.1 --docroot=x --project-type=php --web-environment-add=PLATFORMSH_CLI_TOKEN=notokenrightnow,PLATFORM_PROJECT=notyet,PLATFORM_ENVIRONMENT=notyet
   echo "# doing ddev get $source with template ${template} PROJNAME=${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
   ddev get ${PROJECT_SOURCE}
   echo "# doing ddev restart with template ${template} PROJNAME=${PROJNAME} in ${TESTDIR} ($(pwd))" >&3