From db40fbad598b6f84472cb2921df89f1a46fc6b5c Mon Sep 17 00:00:00 2001
From: Idan Gazit <idan@gazit.me>
Date: Fri, 9 Oct 2020 17:49:42 -0700
Subject: [PATCH] Conditionally source zephyr-env.sh in .bashrc

---
 .devcontainer/.bashrc    | 6 ++++++
 .devcontainer/Dockerfile | 3 +++
 2 files changed, 9 insertions(+)
 create mode 100644 .devcontainer/.bashrc

diff --git a/.devcontainer/.bashrc b/.devcontainer/.bashrc
new file mode 100644
index 00000000..6a6ea691
--- /dev/null
+++ b/.devcontainer/.bashrc
@@ -0,0 +1,6 @@
+export LS_OPTIONS='-F --color=auto'
+eval "`dircolors`"
+alias ls='ls $LS_OPTIONS'
+if [ -f /workspaces/zmk/zephyr/zephyr-env.sh ]; then
+  source /workspaces/zmk/zephyr/zephyr-env.sh
+fi
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 160b1481..184aae9a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -6,3 +6,6 @@ RUN apt-get -y update && \
     ssh \
     gpg && \
     rm -rf /var/lib/apt/lists/*
+
+COPY .bashrc tmp
+RUN mv /tmp/.bashrc ~/.bashrc