Merge branch 'develop' into fix/docker-service-restart-fixes

CHANGELOG.md

@@ -18,6 +18,7 @@ permalink: /docs/en-US/changelog/
 * VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 )
 * Switched from Rackspace to Starburst services for MariaDB mirrors ( #2728 )
 * Fixes for service starts under some situations in Docker ( #2732 )
+* Fixed an issue with trailing slashes and site provisioners introduced in an earlier version (#2731)
 
 ### Maintenance
 

provision/provision-site.sh

@@ -17,7 +17,7 @@ SITE=$1
 SITE_ESCAPED="${SITE//./\\.}"
 REPO=$2
 BRANCH=$3
-VM_DIR=$4
+VM_DIR="${4%/}" # No trailing strings
 SKIP_PROVISIONING=$5
 NGINX_UPSTREAM=$6
 VVV_PATH_TO_SITE=${VM_DIR} # used in site templates
@@ -167,7 +167,7 @@ function vvv_provision_site_nginx_config() {
 
   local NCONFIG
   NCONFIG=$(vvv_search_replace_in_file "${SITE_NGINX_FILE}" "{vvv_path_to_folder}" "${DIR}")
-  NCONFIG=$(vvv_search_replace "${NCONFIG}" "{vvv_path_to_site}" "${VM_DIR}/")
+  NCONFIG=$(vvv_search_replace "${NCONFIG}" "{vvv_path_to_site}" "${VM_DIR}")
   NCONFIG=$(vvv_search_replace "${NCONFIG}" "{vvv_site_name}" "${SITE_NAME}")
   NCONFIG=$(vvv_search_replace "${NCONFIG}" "{vvv_hosts}" "${VVV_HOSTS}")