From b81ffa422f84c8badf1d4f73d3775f2ec1969cc0 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 14 Nov 2024 14:38:40 +0100
Subject: [PATCH] :paperclip: Update devenv entrypoint

---
 docker/devenv/files/bashrc        | 8 --------
 docker/devenv/files/entrypoint.sh | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc
index 5c9e82d26..6dcc66f19 100644
--- a/docker/devenv/files/bashrc
+++ b/docker/devenv/files/bashrc
@@ -1,19 +1,11 @@
 #!/usr/bin/env bash
 
-export PATH=/usr/local/cargo/bin:/usr/lib/jvm/openjdk/bin:/usr/local/nodejs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
-export JAVA_OPTS=${JAVA_OPTS:-"-Xmx1000m -Xms200m"};
-
 alias l='ls --color -GFlh'
 alias rm='rm -r'
 alias ls='ls --color -F'
 alias lsd='ls -d *(/)'
 alias lsf='ls -h *(.)'
 
-# init Cargo / Rust env
-. "/usr/local/cargo/env"
-# init emscripten
-EMSDK_QUIET=1 . "/usr/local/emsdk/emsdk_env.sh"
-
 # include .bashrc if it exists
 if [ -f "$HOME/.bashrc.local" ]; then
     . "$HOME/.bashrc.local"
diff --git a/docker/devenv/files/entrypoint.sh b/docker/devenv/files/entrypoint.sh
index 69d372b35..e65b458a3 100755
--- a/docker/devenv/files/entrypoint.sh
+++ b/docker/devenv/files/entrypoint.sh
@@ -2,6 +2,11 @@
 
 export PATH=/usr/lib/jvm/openjdk/bin:/usr/local/nodejs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
 
+source /usr/local/emsdk/emsdk_env.sh;
+source /usr/local/cargo/env
+
+export JAVA_OPTS=${JAVA_OPTS:-"-Xmx1000m -Xms200m"};
+
 set -e
 usermod -u ${EXTERNAL_UID:-1000} penpot