From 6fe0d74323ce6355eb4c868290f41e5224df3e30 Mon Sep 17 00:00:00 2001
From: Andrejus <git@andrejus.uk>
Date: Wed, 15 Jul 2020 21:36:42 +0100
Subject: [PATCH 1/3] Remove stow files in docker

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 931c422..8b77721 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,14 +13,15 @@ RUN echo "$USER ALL=(ALL) NOPASSWD: ALL" \
     >>/etc/sudoers
 
 # Filesystem steps
+RUN rm /home/$USER/{.profile,.bashrc}
 ENV WORKSPACE="/home/$USER/workspace"
-ENV LOG_TARGET="STDOUT"
 ADD --chown=test-user . "$WORKSPACE/dotfiles"
 WORKDIR "$WORKSPACE/dotfiles"
 
 # Install steps
 USER test-user
 ARG TARGET="all"
+ENV LOG_TARGET="STDOUT"
 RUN make install TARGET=$TARGET
 
 # Test entrypoint

From 60a9a00e42ffb54ebc09181626d2f573e10024bc Mon Sep 17 00:00:00 2001
From: Andrejus <git@andrejus.uk>
Date: Wed, 15 Jul 2020 21:40:18 +0100
Subject: [PATCH 2/3] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8b77721..5244ae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN echo "$USER ALL=(ALL) NOPASSWD: ALL" \
     >>/etc/sudoers
 
 # Filesystem steps
-RUN rm /home/$USER/{.profile,.bashrc}
+RUN rm /home/$USER/.profile /home/$USER/.bashrc
 ENV WORKSPACE="/home/$USER/workspace"
 ADD --chown=test-user . "$WORKSPACE/dotfiles"
 WORKDIR "$WORKSPACE/dotfiles"

From e657c1a3fc932f27281b9ba1ecbc2329b948efc0 Mon Sep 17 00:00:00 2001
From: Andrejus <git@andrejus.uk>
Date: Wed, 15 Jul 2020 21:47:20 +0100
Subject: [PATCH 3/3] Update .profile

---
 files/.profile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/files/.profile b/files/.profile
index 1c9b92e..0d31118 100644
--- a/files/.profile
+++ b/files/.profile
@@ -1,13 +1,9 @@
 if [ -z "$PROFILE_LOCK" ]; then
     export PROFILE_LOCK=1
 
-    # set PATH so it includes user's private bin if it exists
-    if [ -d "$HOME/bin" ]; then
-        export PATH="$HOME/bin:$PATH"
-    fi
-    if [ -d "$HOME/.local/bin" ]; then
-        export PATH="$HOME/.local/bin:$PATH"
-    fi
+    # set PATH so it includes user's private bin
+    export PATH="$HOME/bin:$PATH"
+    export PATH="$HOME/.local/bin:$PATH"
 
     # config
     if [ -z "$XDG_DATA_HOME" ]; then