Merge pull request #317 from tadeubas/integrated_changes

Fix build error when files with Windows line ending CRLF (\r\n)
selfcustody · Feb 17, 2024 · 0bd6d2d · 0bd6d2d
2 parents 2fb80fe + 9eb3aad
commit 0bd6d2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -110,4 +110,5 @@ FROM build-firmware AS build
 ARG DEVICE="maixpy_m5stickv"
 WORKDIR /src/firmware/Kboot/build
 RUN cp /src/firmware/MaixPy/projects/"${DEVICE}"/build/firmware.bin .
+RUN sed -i -e 's/\r$//' *.sh
 RUN ./CLEAN.sh && ./BUILD.sh
diff --git a/krux b/krux
@@ -55,7 +55,7 @@ if [ "$1" == "build" ]; then
     if [ -z "$device" ]; then
         echo "Missing device"
     else
-        declare $(grep -m 1 version pyproject.toml | sed 's/ *= */=/g' | sed 's/"//g')
+        declare $(grep -m 1 version pyproject.toml | sed 's/ *= */=/g' | sed 's/"//g' | sed 's/\r//g')
         sed -i -- 's/VERSION = ".*"/VERSION = "'"$version"'"/g' src/krux/metadata.py
 
         mkdir -p build