File tree Expand file tree Collapse file tree 3 files changed +20
-6
lines changed
Expand file tree Collapse file tree 3 files changed +20
-6
lines changed Original file line number Diff line number Diff line change 2727 source $SCRIPTS_DIR /bootstrap/pic32.sh
2828 source $SCRIPTS_DIR /bootstrap/devel.sh;
2929fi
30+
31+ echo " Bootstrap complete"
Original file line number Diff line number Diff line change @@ -113,11 +113,16 @@ if [ -z $COMMON_SOURCED ]; then
113113 download () {
114114 url=$1
115115 filename=$2
116- # Disabling SSL cert checking (-k), which while strong discouraged, is
117- # used here because some dependency hosts CA bundle files are messed up,
118- # and this software doesn't store any secure data. If Digilent fixes
119- # their SSL certificate bundle we can remove it.
120- curl -k $url -L -o $filename
116+
117+ # if 3rd arg exists, run curl and disable SSL cert checking. Added
118+ # for digilent - see pic32.sh
119+ if [ ! -z $3 ]; then
120+ k_opt=" -k"
121+ else
122+ k_opt=" "
123+ fi
124+ echo " download() running 'curl $k_opt $url -L -o $filename '"
125+ curl $k_opt $url -L -o $filename
121126 }
122127
123128 if [ ` id -u` == 0 ]; then
Original file line number Diff line number Diff line change @@ -9,7 +9,14 @@ source $BOOTSTRAP_DIR/flashing_chipkit.sh
99# # chipKIT libraries for USB, CAN and Network
1010
1111CHIPKIT_LIBRARY_AGREEMENT_URL=" https://reference.digilentinc.com/agreement"
12+
13+ # Disabling SSL cert checking (-k), which while strong discouraged, is
14+ # used here because some dependency hosts CA bundle files are messed up,
15+ # and this software doesn't store any secure data. If Digilent fixes
16+ # their SSL certificate bundle we can remove it.
17+ NOT_SECURE=" true"
1218CHIPKIT_LIBRARY_DOWNLOAD_URL=" https://reference.digilentinc.com/_media/chipkit_network_and_usb_libs-20150115.zip"
19+
1320CHIPKIT_ZIP_FILE=" chipkit_network_and_usb_libs-20150115.zip"
1421
1522_pushd $DEPENDENCIES_FOLDER
2128 echo " Press Enter to verify you have read the license agreement."
2229 read
2330 fi
24- download $CHIPKIT_LIBRARY_DOWNLOAD_URL $CHIPKIT_ZIP_FILE
31+ download $CHIPKIT_LIBRARY_DOWNLOAD_URL $CHIPKIT_ZIP_FILE $NOT_SECURE
2532 unzip $CHIPKIT_ZIP_FILE
2633fi
2734_popd
You can’t perform that action at this time.
0 commit comments