@@ -135,7 +135,7 @@ function install_libraries()
135
135
pushd $HOME /Arduino/libraries
136
136
137
137
# install ArduinoJson library
138
- { test -r ArduinoJson-v6.11.0.zip || wget https://github.com/bblanchon/ArduinoJson/releases/download/v6.11.0/ArduinoJson-v6.11.0.zip; } && unzip ArduinoJson-v6.11.0.zip
138
+ { test -r ArduinoJson-v6.11.0.zip || wget https://github.com/bblanchon/ArduinoJson/releases/download/v6.11.0/ArduinoJson-v6.11.0.zip; } && unzip -q ArduinoJson-v6.11.0.zip
139
139
140
140
popd
141
141
}
@@ -145,8 +145,21 @@ function install_ide()
145
145
local ide_path=$1
146
146
local core_path=$2
147
147
local debug=$3
148
- test -r arduino.tar.xz || wget -O arduino.tar.xz https://www.arduino.cc/download.php? f=/arduino-nightly-linux64.tar.xz
149
- tar xf arduino.tar.xz
148
+ if [ " $MACOSX " = " 1" ]; then
149
+ # MACOS only has next-to-obsolete Python2 installed. Install Python 3 from python.org
150
+ wget https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg
151
+ sudo installer -pkg python-3.7.4-macosx10.9.pkg -target /
152
+ # Install the Python3 certificates, because SSL connections fail w/o them and of course they aren't installed by default.
153
+ ( cd " /Applications/Python 3.7/" && sudo " ./Install Certificates.command" )
154
+ # Hack to place arduino-builder in the same spot as sane OSes
155
+ test -r arduino.zip || wget -O arduino.zip https://downloads.arduino.cc/arduino-nightly-macosx.zip
156
+ unzip -q arduino.zip
157
+ mv Arduino.app arduino-nightly
158
+ mv arduino-nightly/Contents/Java/* arduino-nightly/.
159
+ else
160
+ test -r arduino.tar.xz || wget -O arduino.tar.xz https://www.arduino.cc/download.php? f=/arduino-nightly-linux64.tar.xz
161
+ tar xf arduino.tar.xz
162
+ fi
150
163
mv arduino-nightly $ide_path
151
164
cd $ide_path /hardware
152
165
mkdir esp8266com
@@ -174,7 +187,6 @@ function install_arduino()
174
187
echo -e " travis_fold:start:sketch_test_env_prepare"
175
188
cd $TRAVIS_BUILD_DIR
176
189
install_ide $HOME /arduino_ide $TRAVIS_BUILD_DIR $debug
177
- which arduino
178
190
cd $TRAVIS_BUILD_DIR
179
191
install_libraries
180
192
echo -e " travis_fold:end:sketch_test_env_prepare"
0 commit comments