jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update PR

This commit is contained in:
jaby 2025-01-08 22:13:27 +01:00
parent 3bbd11b4bd
commit 53d26f583e
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
podman/Dockerfile
View File

@ -1,7 +1,7 @@
FROM "ubuntu:22.04" FROM "ubuntu:22.04"
WORKDIR /usr/scripts WORKDIR /usr/scripts
ADD ["scripts/make_gcc.sh", "/usr/scripts"] ADD ["scripts/make_gcc.sh", "/usr/scripts"]
WORKDIR /usr WORKDIR /tmp
RUN apt update && /usr/scripts/make_gcc.sh RUN apt update && /usr/scripts/make_gcc.sh
WORKDIR /usr/scripts WORKDIR /usr/scripts
@ -12,6 +12,7 @@ ADD ["scripts/install_pop-fe.sh", "scripts/run_pop_fe.sh", "/usr/scripts"]
WORKDIR /usr/jaby_engine/bin/extern WORKDIR /usr/jaby_engine/bin/extern
RUN apt update && /usr/scripts/install_pop-fe.sh RUN apt update && /usr/scripts/install_pop-fe.sh
WORKDIR /project
ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}" ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}"
ENV JABY_ENGINE_PATH=/jaby_engine ENV JABY_ENGINE_PATH=/jaby_engine
ENV JABY_ENGINE_DIR=/jaby_engine ENV JABY_ENGINE_DIR=/jaby_engine

14
podman/install.sh
View File

@ -5,9 +5,13 @@ if [[ -z "${JABY_ENGINE_PATH}" ]]; then
echo "Setting JABY_ENGINE_PATH to parent folder" echo "Setting JABY_ENGINE_PATH to parent folder"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")" export JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")"
cat << End >> ~/.profile if cat /etc/passwd | grep $USER | grep bash > /dev/null; then
export JABY_ENGINE_PATH="$JABY_ENGINE_PATH" # Bash found
End echo "export JABY_ENGINE_PATH="$JABY_ENGINE_PATH"" >> ~/.bashrc
source ~/.profile
else
# No bash found
echo "Please add export JABY_ENGINE_PATH="$JABY_ENGINE_PATH" to your shell profile"
fi
fi fi

2
podman/scripts/make_gcc.sh
View File

@ -61,5 +61,5 @@ if [ $? -ne 0 ]; then
fi fi
echo "<<< Delete GCC folder >>>" echo "<<< Delete GCC folder >>>"
cd /usr cd /tmp
rm -fr psx-gcc rm -fr psx-gcc