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/oryx/devcontainer-feature.json | 14 ++++++++++++++
 src/oryx/feature.json              | 14 --------------
 src/oryx/install.sh                |  8 +++-----
 3 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 src/oryx/devcontainer-feature.json
 delete mode 100644 src/oryx/feature.json

(limited to 'src/oryx')

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
new file mode 100644
index 0000000..c526893
--- /dev/null
+++ b/src/oryx/devcontainer-feature.json
@@ -0,0 +1,14 @@
+{
+    "id": "oryx",
+    "name": "Oryx",
+    "containerEnv": {
+        "PATH": "usr/local/oryx:${PATH}",
+        "ORYX_SDK_STORAGE_BASE_URL": "https://oryx-cdn.microsoft.io",
+        "ENABLE_DYNAMIC_INSTALL": "true",
+        "DYNAMIC_INSTALL_ROOT_DIR": "/usr/local"
+    },
+    "install": {
+        "app": "",
+        "file": "install.sh"
+    }
+}
\ No newline at end of file
diff --git a/src/oryx/feature.json b/src/oryx/feature.json
deleted file mode 100644
index 10a468b..0000000
--- a/src/oryx/feature.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "oryx",
-    "name": "Oryx",
-    "containerEnv": {
-        "PATH":"usr/local/oryx:${PATH}",
-        "ORYX_SDK_STORAGE_BASE_URL":"https://oryx-cdn.microsoft.io",
-        "ENABLE_DYNAMIC_INSTALL":"true",
-        "DYNAMIC_INSTALL_ROOT_DIR":"/usr/local"
-    },
-    "install": {
-        "app": "",
-        "file": "install.sh"
-    }
-}
\ No newline at end of file
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index 22c12d8..bdbe395 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -6,11 +6,9 @@
 #
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/hugo.md
 # Maintainer: The VS Code and Codespaces Teams
-#
-# Syntax: ./oryx-debian.sh [Non-root user]
 
-USERNAME=${1:-"automatic"}
-UPDATE_RC=${2:-"true"}
+USERNAME=${USERNAME:-"automatic"}
+UPDATE_RC=${UPDATE_RC:-"true"}
 
 set -eu
 
@@ -28,7 +26,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
     USERNAME=""
     POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in ${POSSIBLE_USERS[@]}; do
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
         if id -u ${CURRENT_USER} > /dev/null 2>&1; then
             USERNAME=${CURRENT_USER}
             break
-- 
cgit v1.2.3