dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix download IDE url in test & add error handling

Browse source
This commit is contained in:
Alissa Huskey 2019-11-12 20:56:48 -07:00
parent e870443f48
commit 3a9ef8dc83
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/script/bootstrap/arduino.sh
View file

@ -9,6 +9,7 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
echo "Installing Arduino..." echo "Installing Arduino..."
ARDUINO_BASENAME="arduino-1.0.6" ARDUINO_BASENAME="arduino-1.0.6"
if [ $OS == "cygwin" ]; then if [ $OS == "cygwin" ]; then
ARDUINO_FILE="$ARDUINO_BASENAME-windows".zip ARDUINO_FILE="$ARDUINO_BASENAME-windows".zip
EXTRACT_COMMAND="unzip -q" EXTRACT_COMMAND="unzip -q"
@ -20,13 +21,25 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
EXTRACT_COMMAND="tar -xzf" EXTRACT_COMMAND="tar -xzf"
fi fi
ARDUINO_URL=http://arduino.cc/download.php?f=/$ARDUINO_FILE ARDUINO_URL=https://downloads.arduino.cc/$ARDUINO_FILE
_pushd $DEPENDENCIES_FOLDER _pushd $DEPENDENCIES_FOLDER
if ! test -e $ARDUINO_FILE if ! test -e $ARDUINO_FILE
then then
echo "Downloading Arduino IDE..." echo "Downloading Arduino IDE..."
download $ARDUINO_URL $ARDUINO_FILE download $ARDUINO_URL $ARDUINO_FILE
if [[ ! "$(file --mime-type $ARDUINO_FILE)" =~ application\/zip ]]; then
mv $ARDUINO_FILE "bad-$ARDUINO_FILE"
echo
echo "[ERROR] Unable to download valid IDE for testing"
echo " Download the IDE manually then try again."
echo
echo " Download from: https://www.arduino.cc/en/Main/Software"
echo " Save to : $DEPENDENCIES_FOLDER"
exit 1
fi
fi fi
if ! test -d $ARDUINO_BASENAME if ! test -d $ARDUINO_BASENAME