diff options
author | Idan Gazit <[email protected]> | 2020-10-12 14:23:34 -0700 |
---|---|---|
committer | Idan Gazit <[email protected]> | 2020-10-12 14:23:34 -0700 |
commit | 737283bcbcbd771767a82fb8abbdbd087c691808 (patch) | |
tree | 8bb94a0e8ff11f3d71de91f865ec1bc55b0d4e42 /.devcontainer | |
parent | eee8eb6e776c81192e81f685bd24a3795467ec91 (diff) | |
download | zmk-737283bcbcbd771767a82fb8abbdbd087c691808.tar.gz zmk-737283bcbcbd771767a82fb8abbdbd087c691808.zip |
Behave properly in GH Codespaces
Diffstat (limited to '.devcontainer')
-rw-r--r-- | .devcontainer/.bashrc | 4 | ||||
-rw-r--r-- | .devcontainer/devcontainer.json | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.devcontainer/.bashrc b/.devcontainer/.bashrc index 855ea75520..9fdb8f69e3 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 940b78b8de..14feeff427 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" + }, } |