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/git/devcontainer-feature.json | 21 +++++++++++++++++++++
 src/git/feature.json              | 21 ---------------------
 src/git/install.sh                |  6 ++----
 3 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 src/git/devcontainer-feature.json
 delete mode 100644 src/git/feature.json

(limited to 'src/git')

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
new file mode 100644
index 0000000..6d9686b
--- /dev/null
+++ b/src/git/devcontainer-feature.json
@@ -0,0 +1,21 @@
+{
+    "id": "git",
+    "name": "Git (may require compilation)",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": ["latest", "os-provided"],
+            "default": "os-provided",
+            "description": "Select or enter a Git version."
+        },
+        "ppa": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install from PPA if available"
+        }
+    },
+    "install": {
+        "app": "",
+        "file": "install.sh"
+    }
+}
\ No newline at end of file
diff --git a/src/git/feature.json b/src/git/feature.json
deleted file mode 100644
index 6d9686b..0000000
--- a/src/git/feature.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "id": "git",
-    "name": "Git (may require compilation)",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": ["latest", "os-provided"],
-            "default": "os-provided",
-            "description": "Select or enter a Git version."
-        },
-        "ppa": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install from PPA if available"
-        }
-    },
-    "install": {
-        "app": "",
-        "file": "install.sh"
-    }
-}
\ No newline at end of file
diff --git a/src/git/install.sh b/src/git/install.sh
index 6900897..1da6500 100644
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -6,11 +6,9 @@
 #
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/git-from-src.md
 # Maintainer: The VS Code and Codespaces Teams
-#
-# Syntax: ./git-from-src-debian.sh [version] [use PPA if available]
 
-GIT_VERSION=${1:-"latest"} # 'system' checks the base image first, else installs 'latest'
-USE_PPA_IF_AVAILABLE=${2:-"false"}
+GIT_VERSION=${VERSION:-"latest"} # 'system' checks the base image first, else installs 'latest'
+USE_PPA_IF_AVAILABLE=${PPA:-"false"}
 
 GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
-- 
cgit v1.2.3