From c12a205ab8e195541acfe0cb654b4888e16ea05c Mon Sep 17 00:00:00 2001 From: Josh Spicer Date: Fri, 3 Jun 2022 10:46:25 -0400 Subject: Pass options via environment variables (#39) * up to docker-in-docker converted * first pass at the rest of the features (and bash linting and updated CLI * move shell linter to own file * rename feature.json -> devcontainer-feature.json * continue on error * continue on error in right spot * formatting * fix AZ_VERSION * update python * restore variable name * update linter actions, fix dind/dfd/desktop scripts, add test-scenaerios * add tree because I like tree * glob for shell linter * fix test-scenarios * shell linter * more shell helper --- src/powershell/devcontainer-feature.json | 20 ++++++++++++++++++++ src/powershell/feature.json | 16 ---------------- src/powershell/install.sh | 5 ++--- 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 src/powershell/devcontainer-feature.json delete mode 100644 src/powershell/feature.json (limited to 'src/powershell') diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json new file mode 100644 index 0000000..07e838f --- /dev/null +++ b/src/powershell/devcontainer-feature.json @@ -0,0 +1,20 @@ +{ + "id": "powershell", + "name": "PowerShell", + "options": { + "version": { + "type": "string", + "proposals": [ + "latest", + "none", + "7.1" + ], + "default": "latest", + "description": "Select or enter a version of PowerShell." + } + }, + "install": { + "app": "", + "file": "install.sh" + } +} \ No newline at end of file diff --git a/src/powershell/feature.json b/src/powershell/feature.json deleted file mode 100644 index 842a629..0000000 --- a/src/powershell/feature.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "powershell", - "name": "PowerShell", - "options": { - "version": { - "type": "string", - "proposals": ["latest", "none", "7.1"], - "default": "latest", - "description": "Select or enter a version of PowerShell." - } - }, - "install": { - "app": "", - "file": "install.sh" - } -} \ No newline at end of file diff --git a/src/powershell/install.sh b/src/powershell/install.sh index b8630c4..be60201 100644 --- a/src/powershell/install.sh +++ b/src/powershell/install.sh @@ -6,12 +6,11 @@ # # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/powershell.md # Maintainer: The VS Code and Codespaces Teams -# -# Syntax: ./powershell-debian.sh [version] set -e -POWERSHELL_VERSION=${1:-"latest"} +POWERSHELL_VERSION=${VERSION:-"latest"} + MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" POWERSHELL_ARCHIVE_ARCHITECTURES="amd64" POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal" -- cgit v1.2.3