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

Fix quotation of further variables

Browse source
This commit is contained in:
Manuel Thalmann 2023-03-25 20:03:42 +01:00
parent ff1ad55d8a
commit e6a256f0ab
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile
View file

@ -51,7 +51,7 @@ RUN \
echo "$heading"; \ echo "$heading"; \
}; \ }; \
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; \
} \ } \
@ -124,10 +124,10 @@ RUN \
[ "$x" -eq "$maxCount" ] && { pkill -9 MDK537.exe; mv "$logFile" "logs/timeout-try$try.log"; }; \ [ "$x" -eq "$maxCount" ] && { pkill -9 MDK537.exe; mv "$logFile" "logs/timeout-try$try.log"; }; \
} & \ } & \
}; \ }; \
wait $pid; \ wait "$pid"; \
exitCode=$?; \ exitCode="$?"; \
# Rename log file according to the state of the installer # Rename log file according to the state of the installer
[ $DEBUG -eq 1 ] \ [ "$DEBUG" -eq 1 ] \
&& [ -f "$logFile" ] \ && [ -f "$logFile" ] \
&& { \ && { \
# Move logs to location based on exit code # Move logs to location based on exit code
@ -146,7 +146,7 @@ RUN \
return "$exitCode"; \ return "$exitCode"; \
}; \ }; \
display=:90; \ display=:90; \
export DISPLAY=$display; \ export DISPLAY="$display"; \
mkdir -p --mode=777 /tmp/.X11-unix; \ mkdir -p --mode=777 /tmp/.X11-unix; \
# Create job for waiting for Xvfb to start # Create job for waiting for Xvfb to start
watchStarting="$(mktemp)"; \ watchStarting="$(mktemp)"; \