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

Reorder commands logically

Browse source
This commit is contained in:
Manuel Thalmann 2023-03-25 21:49:00 +01:00
parent 031a4091e3
commit 26d9f13723
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -29,6 +29,7 @@ RUN \
RUN pip install pyocd RUN pip install pyocd
RUN \ RUN \
wget "${KEIL_URL}" --progress=bar:force:noscroll -O MDK537.exe; \
[ "$DEBUG" -eq 1 ] && { \ [ "$DEBUG" -eq 1 ] && { \
apt-get update; \ apt-get update; \
apt-get install -y \ apt-get install -y \
@ -56,7 +57,6 @@ RUN \
[ -z "$1" ] && cat || echo "$1"; \ [ -z "$1" ] && cat || echo "$1"; \
echo "$heading"; \ echo "$heading"; \
}; \ }; \
wget "${KEIL_URL}" --progress=bar:force:noscroll -O MDK537.exe; \
# Handle console output of MDK537 installer # Handle console output of MDK537 installer
handle_output() { \ handle_output() { \
# A pattern that is supposed to indicates that wine got stuck # A pattern that is supposed to indicates that wine got stuck
@ -83,9 +83,9 @@ RUN \
}; \ }; \
# Run actual MDK537 installer # Run actual MDK537 installer
install_keil() { \ install_keil() { \
printHeading "Starting ARM Keil installation"; \
try="$1"; \ try="$1"; \
logFile="$(mktemp)"; \ logFile="$(mktemp)"; \
printHeading "Starting ARM Keil installation"; \
# Run installer asynchronously # Run installer asynchronously
{ \ { \
{ \ { \