manuth/docker-keil
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Quote further variables

Browse source
This commit is contained in:
Manuel Thalmann 2023-03-25 18:43:13 +01:00
parent e75d4fadaa
commit 9ed6567425
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -21,7 +21,7 @@ RUN \
vim \ vim \
xmlstarlet \ xmlstarlet \
&& { \ && { \
[ $DEBUG -eq 1 ] \ [ $"DEBUG" -eq 1 ] \
&& apt-get install -y \ && apt-get install -y \
build-essential \ build-essential \
imagemagick \ imagemagick \
@ -32,7 +32,7 @@ RUN \
RUN pip install pyocd RUN pip install pyocd
RUN \ RUN \
[ $DEBUG -eq 1 ] && { \ [ "$DEBUG" -eq 1 ] && { \
git clone https://github.com/stefanhaustein/TerminalImageViewer.git && \ git clone https://github.com/stefanhaustein/TerminalImageViewer.git && \
cd TerminalImageViewer/src/main/cpp && \ cd TerminalImageViewer/src/main/cpp && \
make && \ make && \
@ -43,7 +43,7 @@ RUN \
|| true || true
RUN \ RUN \
wget ${KEIL_URL} --progress=bar:force:noscroll -O MDK537.exe; \ wget "${KEIL_URL}" --progress=bar:force:noscroll -O MDK537.exe; \
[ $DEBUG -eq 1 ] && { \ [ $DEBUG -eq 1 ] && { \
mkdir -p logs; \ mkdir -p logs; \
mkdir -p screens; \ mkdir -p screens; \
@ -147,7 +147,7 @@ RUN \
{ \ { \
# Improve arguments for screenshots # Improve arguments for screenshots
ARGS="$([ $DEBUG -eq 1 ] && echo "-screen 0 640x480x24 -dpi 192" || echo "")"; \ ARGS="$([ $DEBUG -eq 1 ] && echo "-screen 0 640x480x24 -dpi 192" || echo "")"; \
Xvfb ${DISPLAY} ${ARGS} & \ Xvfb "${DISPLAY}" ${ARGS} & \
}; \ }; \
displayPID="$!"; \ displayPID="$!"; \
# Wait for Xvfb to start # Wait for Xvfb to start