From 737283bcbcbd771767a82fb8abbdbd087c691808 Mon Sep 17 00:00:00 2001
From: Idan Gazit <idan@gazit.me>
Date: Mon, 12 Oct 2020 14:23:34 -0700
Subject: [PATCH] Behave properly in GH Codespaces
---
.devcontainer/.bashrc | 4 +++-
.devcontainer/devcontainer.json | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.devcontainer/.bashrc b/.devcontainer/.bashrc
index 855ea755..9fdb8f69 100644
--- a/.devcontainer/.bashrc
+++ b/.devcontainer/.bashrc
@@ -1,6 +1,8 @@
export LS_OPTIONS='-F --color=auto'
-eval "`dircolors`"
alias ls='ls $LS_OPTIONS'
+if [ "${CODESPACES}" = "true" ]; then
+ export WORKSPACE_DIR="$HOME/workspace/zmk"
+fi
if [ -f "$WORKSPACE_DIR/zephyr/zephyr-env.sh" ]; then
source "$WORKSPACE_DIR/zephyr/zephyr-env.sh"
fi
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 940b78b8..14feeff4 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
"dockerFile": "Dockerfile",
"extensions": ["ms-vscode.cpptools"],
"runArgs": ["--security-opt", "label=disable"],
- "containerEnv": {"WORKSPACE_DIR": "${containerWorkspaceFolder}"}
+ "containerEnv": {"WORKSPACE_DIR": "${containerWorkspaceFolder}"},
+ "settings": {
+ "terminal.integrated.shell.linux": "/bin/bash"
+ },
}