diff options
| author | Carey <kcarey1@APC02S226SG8WM.local> | 2020-10-28 07:40:54 -0500 |
|---|---|---|
| committer | Carey <kcarey1@APC02S226SG8WM.local> | 2020-10-28 07:40:54 -0500 |
| commit | 99ad9cbdefee94007511ec2e53437951cf0e4305 (patch) | |
| tree | 168c9886965ad5e5f36f4fbbad55cd5f70c5124e /.devcontainer | |
| parent | 6aae66782682ffcabf953d785308b83ee16fc3b6 (diff) | |
| parent | cb922fd8a2a3eddcbece040ca3727d43b171ffe3 (diff) | |
Merge https://github.com/zmkfirmware/zmk into refactor_kconfig
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 855ea75..9fdb8f6 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 940b78b..14feeff 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" + }, } |