tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent f4798e8786
commit 5a539441b8
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -289,6 +289,7 @@ prompt_before_flashing() {
flash() { flash() {
compile "$@" compile "$@"
find_device_vid_pid
# Check to see if we can see a keyboard bootloader port. # Check to see if we can see a keyboard bootloader port.
# If we -can-, then we should skip over the "reset to bootloader" thing # If we -can-, then we should skip over the "reset to bootloader" thing
find_bootloader_ports find_bootloader_ports
@ -472,7 +473,6 @@ find_bootloader_ports() {
return return
fi fi
find_device_vid_pid
: "${BOOTLOADER_VID:=${VID}}" : "${BOOTLOADER_VID:=${VID}}"
if [ "${uname_S}" = "Darwin" ]; then if [ "${uname_S}" = "Darwin" ]; then
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos"
@ -497,7 +497,6 @@ find_device_port() {
return return
fi fi
find_device_vid_pid
if [ "${uname_S}" = "Darwin" ]; then if [ "${uname_S}" = "Darwin" ]; then
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos"
DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})"

Loading…
Cancel
Save