Fix #154. symlink-project error after a gitlab_templates release

README.md

@@ -55,7 +55,7 @@ This project provides the following DDEV container commands.
 
 - Optional. The [ddev-selenium-standalone-chrome add-on helps run FunctionalJavascript and Nightwatch tests](https://github.com/ddev/ddev-selenium-standalone-chrome).
 - Optional: [Install the ddev-mkdocs extension for local preview of your docs site](https://github.com/nireneko/ddev-mkdocs). Drupal.org's Gitlab CI can [automatically publish your site](https://project.pages.drupalcode.org/gitlab_templates/jobs/pages/).
-- Optional. Commit the changes in the `.ddev` folder after this plugin installs. This saves other users from having to install this integration.
+- Optional. Commit the changes in the `.ddev` folder after this add-on installs. This saves other users from having to install this integration.
 - To install javascript dependencies, run `ddev exec "cd web/core && yarn install"`
 - If you add/remove a root file or directory, re-symlink root files via EITHER of these methods
   - `ddev restart`

commands/web/symlink-project

@@ -10,14 +10,15 @@
 set -eu -o pipefail
 
 export _WEB_ROOT=$DDEV_DOCROOT
-#todo use more dynamic ref.
 cd "$DDEV_COMPOSER_ROOT" || exit
 curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/scripts/symlink_project.php
 
 # Suppress a warning.
 PROJECT_FILES=$(ls -A --ignore="web" --ignore="vendor" --ignore="symlink_project.php" --ignore=".ddev" --ignore=".idea")
 export PROJECT_FILES
+# Used by the symlink-project script in gitlab_templates
 # Symlink name using underscores.
 # @see https://www.drupal.org/docs/develop/creating-modules/naming-and-placing-your-drupal-module
-php symlink_project.php "${DDEV_SITENAME//-/_}"
+export DRUPAL_PROJECT_FOLDER=${DDEV_DOCROOT}/${DRUPAL_PROJECTS_PATH}/${DDEV_SITENAME//-/_}
+php symlink_project.php
 rm -f symlink_project.php