apply suggestion

devcontainers · Jan 5, 2023 · 36325b6 · 36325b6
1 parent a700cfe
commit 36325b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/src/spec-configuration/containerFeaturesConfiguration.ts b/src/spec-configuration/containerFeaturesConfiguration.ts
@@ -265,6 +265,7 @@ export function getFeatureInstallWrapperScript(feature: Feature, featureSet: Fea
 		warningHeader += `(!) WARNING: This feature has been renamed. Please update the reference in devcontainer.json to "${escapeQuotesForShell(feature.currentId)}".`;
 	}
 
+	const echoWarning = warningHeader ? `echo '${warningHeader}'` : '';
 	const errorMessage = `ERROR: Feature "${name}" (${id}) failed to install!`;
 	const troubleshootingMessage = documentation
 		? ` Look at the documentation at ${documentation} for help troubleshooting this error.`
@@ -281,11 +282,7 @@ on_exit () {
 trap on_exit EXIT
 
 echo ===========================================================================
-if [ "${warningHeader}" != '' ]
-then
-	echo '${warningHeader}'
-fi
-
+${echoWarning}
 echo 'Feature       : ${name}'
 echo 'Description   : ${description}'
 echo 'Id            : ${id}'

diff --git a/src/test/container-features/featureHelpers.test.ts b/src/test/container-features/featureHelpers.test.ts
@@ -481,10 +481,6 @@ on_exit () {
 trap on_exit EXIT
 
 echo ===========================================================================
-if [ "" != '' ]
-then
-	echo ''
-fi
 
 echo 'Feature       : Unknown'
 echo 'Description   : '
@@ -565,10 +561,6 @@ on_exit () {
 trap on_exit EXIT
 
 echo ===========================================================================
-if [ "" != '' ]
-then
-	echo ''
-fi
 
 echo 'Feature       : My Test Feature'
 echo 'Description   : This is an awesome feature (with ""quotes" for '\\''escaping'\\'' test)'
@@ -651,11 +643,7 @@ on_exit () {
 trap on_exit EXIT
 
 echo ===========================================================================
-if [ "(!) WARNING: Using the deprecated Feature "test". This Feature will no longer receive any further updates/support.\n" != '' ]
-then
-	echo '(!) WARNING: Using the deprecated Feature "test". This Feature will no longer receive any further updates/support.\n'
-fi
-
+echo '(!) WARNING: Using the deprecated Feature "test". This Feature will no longer receive any further updates/support.\n'
 echo 'Feature       : My Test Feature'
 echo 'Description   : This is an awesome feature (with ""quotes" for '\\''escaping'\\'' test)'
 echo 'Id            : ghcr.io/my-org/my-repo/test'
@@ -740,11 +728,7 @@ on_exit () {
 trap on_exit EXIT
 
 echo ===========================================================================
-if [ "(!) WARNING: This feature has been renamed. Please update the reference in devcontainer.json to "ghcr.io/my-org/my-repo/new-test"." != '' ]
-then
-	echo '(!) WARNING: This feature has been renamed. Please update the reference in devcontainer.json to "ghcr.io/my-org/my-repo/new-test".'
-fi
-
+echo '(!) WARNING: This feature has been renamed. Please update the reference in devcontainer.json to "ghcr.io/my-org/my-repo/new-test".'
 echo 'Feature       : My New Test Feature'
 echo 'Description   : This is an awesome feature (with ""quotes" for '\\''escaping'\\'' test)'
 echo 'Id            : ghcr.io/my-org/my-repo/test'