Skip to content

Commit a7fbb38

Browse files
committed
Avoid duplicate code in install_ide
1 parent 8cc962d commit a7fbb38

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

arduino-ci-script.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,15 @@ function install_ide()
199199

200200
if [[ "$IDEversion" == "hourly" ]]; then
201201
# Deal with the inaccurate name given to the hourly build download
202-
wget --no-verbose $ARDUINO_CI_SCRIPT_QUIET_OPTION "http://downloads.arduino.cc/arduino-nightly-linux64.${downloadFileExtension}"
203-
tar --extract --file="arduino-nightly-linux64.${downloadFileExtension}"
204-
rm $ARDUINO_CI_SCRIPT_VERBOSITY_OPTION "arduino-nightly-linux64.${downloadFileExtension}"
205-
mv $ARDUINO_CI_SCRIPT_VERBOSITY_OPTION "arduino-nightly" "$ARDUINO_CI_SCRIPT_APPLICATION_FOLDER/arduino-${IDEversion}"
206-
202+
local downloadVersion="nightly"
207203
else
208-
wget --no-verbose $ARDUINO_CI_SCRIPT_QUIET_OPTION "http://downloads.arduino.cc/arduino-${IDEversion}-linux64.${downloadFileExtension}"
209-
tar --extract --file="arduino-${IDEversion}-linux64.${downloadFileExtension}"
210-
rm $ARDUINO_CI_SCRIPT_VERBOSITY_OPTION "arduino-${IDEversion}-linux64.${downloadFileExtension}"
211-
mv $ARDUINO_CI_SCRIPT_VERBOSITY_OPTION "arduino-${IDEversion}" "$ARDUINO_CI_SCRIPT_APPLICATION_FOLDER/arduino-${IDEversion}"
204+
local downloadVersion="$IDEversion"
212205
fi
206+
207+
wget --no-verbose $ARDUINO_CI_SCRIPT_QUIET_OPTION "http://downloads.arduino.cc/arduino-${downloadVersion}-linux64.${downloadFileExtension}"
208+
tar --extract --file="arduino-${downloadVersion}-linux64.${downloadFileExtension}"
209+
rm $ARDUINO_CI_SCRIPT_VERBOSITY_OPTION "arduino-${downloadVersion}-linux64.${downloadFileExtension}"
210+
mv $ARDUINO_CI_SCRIPT_VERBOSITY_OPTION "arduino-${downloadVersion}" "$ARDUINO_CI_SCRIPT_APPLICATION_FOLDER/arduino-${IDEversion}"
213211
done
214212

215213
# Temporarily install the latest IDE version

0 commit comments

Comments
 (0)