Fix issue where wordpress config isn't read/written in correct directory, fixes #76 (#77)

Co-authored-by: Jake Paris <[email protected]>

Author: jakeparis

install.yaml

@@ -46,7 +46,12 @@ removal_actions:
   - |
     #ddev-nodisplay
     #ddev-description:Remove browsersync settings for WordPress if applicable
-    rm -f "${DDEV_APPROOT}/wp-config-ddev-browsersync.php"
+    if [ $DDEV_DOCROOT != "" ]; then
+      DDEV_SITE_PATH="${DDEV_APPROOT}/${DDEV_DOCROOT}" ;
+    else
+      DDEV_SITE_PATH=$DDEV_APPROOT
+    fi
+    rm -f "${DDEV_SITE_PATH}/wp-config-ddev-browsersync.php"
     scripts/remove-wordpress-settings.sh
   # Don't automatically renable settings management in case user didn't have it enabled in the first place
   - |

scripts/remove-wordpress-settings.sh

@@ -11,7 +11,13 @@ fi
 #   exit 0
 # fi
 
-SETTINGS_FILE_NAME="${DDEV_APPROOT}/wp-config.php"
+if [ $DDEV_DOCROOT != "" ]; then
+  DDEV_SITE_PATH="${DDEV_APPROOT}/${DDEV_DOCROOT}" ;
+else
+  DDEV_SITE_PATH=$DDEV_APPROOT
+fi
+
+SETTINGS_FILE_NAME="${DDEV_SITE_PATH}/wp-config.php"
 
 echo "Removing wp-config-ddev-browsersync.php from: ${SETTINGS_FILE_NAME}"
 
@@ -20,5 +26,5 @@ awk '
 /\/\*\* Include for ddev-browsersync to modify WP_HOME and WP_SITEURL\./ { skip=1 }
 skip && /\}.*$/ { skip=0; getline; next }
 !skip
-' ${DDEV_APPROOT}/wp-config.php > ${DDEV_APPROOT}/wp-config-temp.php
-mv ${DDEV_APPROOT}/wp-config-temp.php ${DDEV_APPROOT}/wp-config.php
+' ${DDEV_SITE_PATH}/wp-config.php > ${DDEV_SITE_PATH}/wp-config-temp.php
+mv ${DDEV_SITE_PATH}/wp-config-temp.php ${DDEV_SITE_PATH}/wp-config.php

scripts/setup-wordpress-settings.sh

@@ -11,14 +11,20 @@ fi
 #   exit 0
 # fi
 
-cp scripts/wp-config-ddev-browsersync.php $DDEV_APPROOT/
+if [ $DDEV_DOCROOT != "" ]; then
+  DDEV_SITE_PATH="${DDEV_APPROOT}/${DDEV_DOCROOT}" ;
+else
+  DDEV_SITE_PATH=$DDEV_APPROOT
+fi
+
+cp scripts/wp-config-ddev-browsersync.php $DDEV_SITE_PATH/
 
-SETTINGS_FILE_NAME="${DDEV_APPROOT}/wp-config.php"
+SETTINGS_FILE_NAME="${DDEV_SITE_PATH}/wp-config.php"
 
 echo "Settings file name: ${SETTINGS_FILE_NAME}"
 
 # If wp-config.php already contains the require_once() then exit early.
-if grep -q "/\*\* Include for ddev-browsersync to modify WP_HOME and WP_SITEURL. \*/" ${DDEV_APPROOT}/wp-config.php; then
+if grep -q "/\*\* Include for ddev-browsersync to modify WP_HOME and WP_SITEURL. \*/" ${DDEV_SITE_PATH}/wp-config.php; then
    exit 0
 fi
 
@@ -37,7 +43,7 @@ awk '
     next
 }
 {print}
-' ${DDEV_APPROOT}/wp-config.php > ${DDEV_APPROOT}/wp-config-temp.php
+' ${DDEV_SITE_PATH}/wp-config.php > ${DDEV_SITE_PATH}/wp-config-temp.php
 
 # Replace the real config file with the modified version in temporary file.
-mv ${DDEV_APPROOT}/wp-config-temp.php ${DDEV_APPROOT}/wp-config.php
+mv ${DDEV_SITE_PATH}/wp-config-temp.php ${DDEV_SITE_PATH}/wp-config.php