Merge branch 'keithduncan/fix-sc2295' into keithduncan/release/5.5.1

Author: keithduncan

packer/linux/conf/buildkite-agent/hooks/environment

@@ -96,7 +96,7 @@ if [[ "${DOCKER_USERNS_REMAP:-false}" == "false" ]] ; then
   #   BUILDKITE_BUILD_PATH="/var/lib/buildkite-agent/builds"
 
   # So we can calculate the suffix as a substring:
-  AGENT_ORG_PIPELINE_DIR="${BUILDKITE_BUILD_CHECKOUT_PATH#${BUILDKITE_BUILD_PATH}/}"
+  AGENT_ORG_PIPELINE_DIR="${BUILDKITE_BUILD_CHECKOUT_PATH#"${BUILDKITE_BUILD_PATH}/"}"
   # => "my-agent-1/my-org/my-pipeline"
 
   # Then we can grab just the first path component, the agent name, by removing
@@ -105,7 +105,7 @@ if [[ "${DOCKER_USERNS_REMAP:-false}" == "false" ]] ; then
   # => "my-agent-1"
 
   # Then we can figure out the org/pipeline path component
-  ORG_PIPELINE_DIR="${AGENT_ORG_PIPELINE_DIR#${AGENT_DIR}/}"
+  ORG_PIPELINE_DIR="${AGENT_ORG_PIPELINE_DIR#"${AGENT_DIR}/"}"
   # => "my-org/my-pipeline"
 
   # Then we grab just the first path component, the org, by removing the longest
@@ -114,7 +114,7 @@ if [[ "${DOCKER_USERNS_REMAP:-false}" == "false" ]] ; then
   # => "my-org"
 
   # Then we can figure out the pipeline path component using the org dir
-  PIPELINE_DIR="${ORG_PIPELINE_DIR#${ORG_DIR}/}"
+  PIPELINE_DIR="${ORG_PIPELINE_DIR#"${ORG_DIR}/"}"
   # => "my-pipeline"
 
   # Now we can pass this to the sudo script which will validate it before safely chmodding: