From ab536ee13da4fce84b867447609a860732e40875 Mon Sep 17 00:00:00 2001
From: objnull <accounts@objnull.net>
Date: Sat, 10 Aug 2024 00:38:20 -0400
Subject: [PATCH] Build Script Updates (NON WORKING)

---
 docker/Dockerfile     | 10 ++++++++--
 docker/flipper-dev.sh |  2 +-
 scripts/build.sh      |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 838014b..7cdc123 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,15 +8,21 @@ WORKDIR /tmp/src
 
 ## Installing Requisites
 RUN apt update -y
-RUN apt install -y wget curl build-essential
+RUN apt install -y wget curl build-essential pkg-config libssl-dev
 
 ## Downloading RUSTUP
 RUN wget https://sh.rustup.rs -O /tmp/rustup.sh
 RUN chmod +x /tmp/rustup.sh
 RUN /tmp/rustup.sh -y
+RUN chmod +x /root/.cargo/env
+RUN /root/.cargo/env
+
+## Downloading rustup requirements
+RUN /root/.cargo/bin/rustup toolchain install nightly
+RUN /root/.cargo/bin/cargo install cargo-generate
 
 ## Flipper-Zero Build Target
-RUN /root/.cargo/bin/rustup target add thumbv7em-none-eabihf
+RUN /root/.cargo/bin/rustup target add --toolchain nightly thumbv7em-none-eabihf
 
 ## Copying compile script
 COPY docker/flipper-dev.sh /bin/flipper-dev.sh
diff --git a/docker/flipper-dev.sh b/docker/flipper-dev.sh
index 6884a04..41a1d64 100644
--- a/docker/flipper-dev.sh
+++ b/docker/flipper-dev.sh
@@ -2,7 +2,7 @@
 cp -r /src/* ./
 
 # Building the Project
-/root/.cargo/bin/cargo build
+/root/.cargo/bin/cargo build --target thumbv7em-none-eabihf
 
 # Copy the .FAP file to the app directory
 cp ./target/thumbv7em-none-eabihf/debug/*.fap /app/
\ No newline at end of file
diff --git a/scripts/build.sh b/scripts/build.sh
index 9eb890b..3552a46 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,6 +1,7 @@
 clear
 echo "Building Project"
 docker run --rm -it \
+    -e USER=$USER \
     -v "$PWD/project:/src:ro,z" \
     -v "$PWD/build:/app:Z" \
     flipper-dev
\ No newline at end of file