From 92355d394f7cc1706ec78f0a18f1578fc280cc9a Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Wed, 18 Sep 2024 15:14:51 +0100 Subject: [PATCH 1/2] Prevent VM_DIR and VVV_PATH_TO_SITE having trailing slashes Fixes a bug introduced in https://github.com/Varying-Vagrant-Vagrants/VVV/commit/abea1f59de627e5276178d730ce1e61c74f6b10a --- provision/provision-site.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision/provision-site.sh b/provision/provision-site.sh index 0c8b897c7..b8d6e1a18 100644 --- a/provision/provision-site.sh +++ b/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}") From 9dbcd29900c585b14d5eb37e9c301f3873bf1a67 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Wed, 18 Sep 2024 15:36:10 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad21a4b5f..2391ee560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,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 ) +* Fixed an issue with trailing slashes and site provisioners introduced in an earlier version (#2731) ## 3.13.2 ( 2024 July 19th )