test: Test CI

salt-labs · Jul 22, 2023 · 7c25f89 · 7c25f89
1 parent 5439e48
commit 7c25f89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/nix/oci/tanzu/default.nix b/nix/oci/tanzu/default.nix
@@ -274,8 +274,7 @@ in
         "TERM=xterm"
         "TZ=UTC"
         "WORKDIR=/workdir"
-        "VSCODE_CONTAINER_ENV=FALSE"
-        "VSCODE_REMOTE_ENV=FALSE"
+        "ENVIRONMENT_VSCODE=none"
       ];
       WorkingDir = "/workdir";
       WorkDir = "/workdir";

diff --git a/nix/oci/tanzu/root/etc/profile.d/tanzu.sh b/nix/oci/tanzu/root/etc/profile.d/tanzu.sh
@@ -49,7 +49,7 @@ if [[ -f "${HOME}/.config/tanzu/config.yaml" ]]; then
 fi
 
 # Make sure that the interactive parts are not run in a a VSCode remote env.
-if [[ "${VSCODE_REMOTE_ENV:-FALSE}" == "TRUE" ]]; then
+if [[ "${ENVIRONMENT_VSCODE^^}" == "REMOTE" ]]; then
 
 	echo "$(date '+%Y/%m/%d %T'): INFO: VSCode remote environment detected, skipping interactive parts." | tee -a "/tmp/vscode-remote-env.log"
 

diff --git a/nix/oci/tanzu/root/etc/skel/.bashrc b/nix/oci/tanzu/root/etc/skel/.bashrc
@@ -115,7 +115,7 @@ if ! shopt -oq posix; then
 fi
 
 # Make sure that the interactive parts are not run in a a VSCode remote env.
-if [[ ${VSCODE_REMOTE_ENV:-FALSE} == "TRUE" ]]; then
+if [[ "${ENVIRONMENT_VSCODE^^}" == "REMOTE" ]]; then
 
 	echo "$(date '+%Y/%m/%d %T'): INFO: VSCode remote environment detected, skipping interactive parts." | tee -a "/tmp/vscode-remote-env.log"
 

diff --git a/nix/oci/tanzu/root/usr/local/bin/entrypoint.sh b/nix/oci/tanzu/root/usr/local/bin/entrypoint.sh
@@ -8,7 +8,7 @@ fi
 /usr/bin/env bash --login -i || true
 
 # Make sure that the interactive parts are not run in a a VSCode remote env.
-if [[ "${VSCODE_REMOTE_ENV:-FALSE}" == "TRUE" ]]; then
+if [[ "${ENVIRONMENT_VSCODE^^}" == "REMOTE" ]]; then
 
 	echo "$(date '+%Y/%m/%d %T'): INFO: VSCode remote environment detected, skipping interactive parts." | tee -a "/tmp/vscode-remote-env.log"