From 819558cf9d2e23087366fa7e85348661e434e5a0 Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Sun, 5 Jan 2025 13:30:57 +0100
Subject: [PATCH] Make Rust work better; Adjust docker version

---
 examples/PoolBox/PoolBox.code-workspace | 2 +-
 podman/Dockerfile                       | 2 +-
 scripts/podman_jaby_engine.sh           | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace
index cb769059..cbe22001 100644
--- a/examples/PoolBox/PoolBox.code-workspace
+++ b/examples/PoolBox/PoolBox.code-workspace
@@ -20,7 +20,7 @@
 			{
 				"label": "read memory map",
 				"type": "shell", // TODO: Make this work again? Or remove it and just tell people how to use it? Does not work with docker...?
-				"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder} . psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf",
+				"command": "${env:JABY_ENGINE_PATH}/bin/psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf",
 				"problemMatcher": [],
 			}
 		],
diff --git a/podman/Dockerfile b/podman/Dockerfile
index 5dd841a3..0f287910 100644
--- a/podman/Dockerfile
+++ b/podman/Dockerfile
@@ -1,4 +1,4 @@
-FROM "ubuntu:24.04"
+FROM "ubuntu:22.04"
 WORKDIR /usr/scripts
 ADD ["scripts/make_gcc.sh", "/usr/scripts"]
 WORKDIR /usr
diff --git a/scripts/podman_jaby_engine.sh b/scripts/podman_jaby_engine.sh
index 4a10a2d2..febc6649 100755
--- a/scripts/podman_jaby_engine.sh
+++ b/scripts/podman_jaby_engine.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+JABY_ENGINE_DOT_FOLDER="$HOME/.jaby_engine"
+JABY_ENGINE_CARGO_FOLDER="$JABY_ENGINE_DOT_FOLDER/cargo/registry"
+
 if [[ -n "${PSX_LICENSE_PATH}" ]]; then
 LICENSE_MOUNT="-v ${PSX_LICENSE_PATH}:/psx_license"
 else
@@ -9,4 +12,5 @@ PROJECT_PATH=$1
 PROJECT_WORK_DIR=$2
 shift
 shift
-podman run --rm -it -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@
\ No newline at end of file
+mkdir -p $JABY_ENGINE_CARGO_FOLDER
+podman run --rm -it -v $JABY_ENGINE_CARGO_FOLDER:/root/.cargo/registry -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@
\ No newline at end of file