From c12a205ab8e195541acfe0cb654b4888e16ea05c Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
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/dotnet/devcontainer-feature.json | 43 ++++++++++++++++++++++++++++++++++++
 src/dotnet/feature.json              | 38 -------------------------------
 src/dotnet/install.sh                | 21 +++++++++---------
 3 files changed, 53 insertions(+), 49 deletions(-)
 create mode 100644 src/dotnet/devcontainer-feature.json
 delete mode 100644 src/dotnet/feature.json

(limited to 'src/dotnet')

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
new file mode 100644
index 0000000..04b2811
--- /dev/null
+++ b/src/dotnet/devcontainer-feature.json
@@ -0,0 +1,43 @@
+{
+    "id": "dotnet",
+    "name": "Dotnet CLI",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "6.0",
+                "5.0",
+                "3.1"
+            ],
+            "default": "latest",
+            "description": "Select or enter a dotnet CLI version. (Available versions may vary by Linux distribution.)"
+        },
+        "runtime_only": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install just the dotnet runtime if true, and sdk if false."
+        },
+        "override_default_version": {
+            "type": "boolean",
+            "default": "true",
+            "description": "If true, overrides existing version (if any) of dotnet on the PATH"
+        },
+        "install_using_apt": {
+            "type": "boolean",
+            "default": "true",
+            "description": "If true, it installs using apt instead of the release URL"
+        }
+    },
+    "containerEnv": {
+        "DOTNET_ROOT": "/usr/local/dotnet/current",
+        "PATH": "${PATH}:${DOTNET_ROOT}"
+    },
+    "extensions": [
+        "ms-dotnettools.csharp"
+    ],
+    "install": {
+        "app": "",
+        "file": "install.sh"
+    }
+}
\ No newline at end of file
diff --git a/src/dotnet/feature.json b/src/dotnet/feature.json
deleted file mode 100644
index 4e2c7a7..0000000
--- a/src/dotnet/feature.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "id": "dotnet",
-    "name": "Dotnet CLI",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": ["latest","6.0","5.0","3.1"],
-            "default": "latest",
-            "description": "Select or enter a dotnet CLI version. (Available versions may vary by Linux distribution.)"
-        },
-        "runtimeOnly": {
-            "type":"boolean",
-            "default": false,
-            "description": "Install just the dotnet runtime if true, and sdk if false."
-        },
-        "overrideDefaultVersion": {
-          "type": "boolean",
-          "default": "true",
-          "description": "If true, overrides existing version (if any) of dotnet on the PATH"
-        },
-        "installUsingApt": {
-            "type": "boolean",
-            "default": "true",
-            "description": "If true, it installs using apt instead of the release URL"
-        }
-    },
-    "containerEnv": {
-        "DOTNET_ROOT": "/usr/local/dotnet/current",
-        "PATH": "${PATH}:${DOTNET_ROOT}"
-    },
-    "extensions": [
-        "ms-dotnettools.csharp"
-    ],
-    "install": {
-        "app": "",
-        "file": "install.sh"
-    }
-}
\ No newline at end of file
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 4052dbd..0a147bc 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -6,17 +6,16 @@
 #
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/dotnet.md
 # Maintainer: The VS Code and Codespaces Teams
-#
-# Syntax: ./dotnet-debian.sh [.NET version] [.NET runtime only] [non-root user] [add TARGET_DOTNET_ROOT to rc files flag] [.NET root] [access group name]
-
-DOTNET_VERSION=${1:-"latest"}
-DOTNET_RUNTIME_ONLY=${2:-"false"}
-USERNAME=${3:-"automatic"}
-UPDATE_RC=${4:-"true"}
-TARGET_DOTNET_ROOT=${5:-"/usr/local/dotnet"}
-ACCESS_GROUP=${6:-"dotnet"}
-OVERRIDE_DEFAULT_VERSION=${7:-"true"}
-INSTALL_USING_APT=${8:-"true"}
+
+DOTNET_VERSION=${VERSION:-"latest"}
+DOTNET_RUNTIME_ONLY=${RUNTIME_ONLY:-"false"}
+OVERRIDE_DEFAULT_VERSION=${OVERRIDE_DEFAULT_VERSION:-"true"}
+INSTALL_USING_APT=${INSTALL_USING_APT:-"true"}
+
+USERNAME=${USERNAME:-"automatic"}
+UPDATE_RC=${UPDATE_RC:-"true"}
+TARGET_DOTNET_ROOT=${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}
+ACCESS_GROUP=${ACCESS_GROUP:-"dotnet"}
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOTNET_ARCHIVE_ARCHITECTURES="amd64"
-- 
cgit v1.2.3