'' -> ''

Author: joshspicer

src/spec-common/variableSubstitution.ts

@@ -124,10 +124,10 @@ function replaceContainerEnv(isWindows: boolean, configFile: URI | undefined, co
 	}
 }
 
-function replaceFeatureRoot(featureRoot: string | undefined, match: string, variable: string) {
+function replaceFeatureRoot(featureRootFolder: string | undefined, match: string, variable: string) {
 	switch (variable) {
-		case 'featureRoot':
-			return featureRoot || match;
+		case 'featureRootFolder':
+			return featureRootFolder || match;
 
 		default:
 			return match;

src/test/container-features/configs/lifecycle-hooks-advanced/.devcontainer/otter/devcontainer-feature.json

@@ -2,21 +2,21 @@
     "id": "otter",
     "version": "1.2.3",
     "options": {},
-    "updateContentCommand": "${featureRoot}/helper_script.sh updateContentCommand",
-    "onCreateCommand": "${featureRoot}/helper_script.sh onCreateCommand",
+    "updateContentCommand": "${featureRootFolder}/helper_script.sh updateContentCommand",
+    "onCreateCommand": "${featureRootFolder}/helper_script.sh onCreateCommand",
     "postCreateCommand": {
-        "parallel1": "${featureRoot}/helper_script.sh parallel_postCreateCommand_1",
+        "parallel1": "${featureRootFolder}/helper_script.sh parallel_postCreateCommand_1",
         "parallel2": [
-            "${featureRoot}/helper_script.sh",
+            "${featureRootFolder}/helper_script.sh",
             "parallel_postCreateCommand_2"
         ]
     },
     "postStartCommand": [
-        "${featureRoot}/helper_script.sh",
+        "${featureRootFolder}/helper_script.sh",
         "postStartCommand"
     ],
     "postAttachCommand": [
-        "${featureRoot}/helper_script.sh",
+        "${featureRootFolder}/helper_script.sh",
         "postAttachCommand"
     ]
 }

src/test/container-features/configs/lifecycle-hooks-advanced/.devcontainer/rabbit/devcontainer-feature.json

@@ -2,21 +2,21 @@
     "id": "rabbit",
     "version": "100.200.300",
     "options": {},
-    "updateContentCommand": "${featureRoot}/helper_script.sh updateContentCommand",
-    "onCreateCommand": "${featureRoot}/helper_script.sh onCreateCommand",
+    "updateContentCommand": "${featureRootFolder}/helper_script.sh updateContentCommand",
+    "onCreateCommand": "${featureRootFolder}/helper_script.sh onCreateCommand",
     "postCreateCommand": {
-        "parallel1": "${featureRoot}/helper_script.sh parallel_postCreateCommand_1",
+        "parallel1": "${featureRootFolder}/helper_script.sh parallel_postCreateCommand_1",
         "parallel2": [
-            "${featureRoot}/helper_script.sh",
+            "${featureRootFolder}/helper_script.sh",
             "parallel_postCreateCommand_2"
         ]
     },
     "postStartCommand": [
-        "${featureRoot}/helper_script.sh",
+        "${featureRootFolder}/helper_script.sh",
         "postStartCommand"
     ],
     "postAttachCommand": [
-        "${featureRoot}/helper_script.sh",
+        "${featureRootFolder}/helper_script.sh",
         "postAttachCommand"
     ]
 }

src/test/container-features/lifecycleHooks.test.ts

@@ -170,7 +170,7 @@ describe('Feature lifecycle hooks', function () {
 				assert.match(containerUpStandardError, /Running parallel2 from devcontainer.json.../);
 
 				// Since lifecycle scripts are executed relative to the workspace folder,
-				// to run a script bundled with the Feature, the user needs to use the '${featureRoot}' variable.
+				// to run a script bundled with the Feature, the user needs to use the '${featureRootFolder}' variable.
 				// This variable can only be used in a devcontainer-feature.json's lifecycle scripts.
 				// And will return the temporary directory where the Feature's files are copied to.