Get the device prober on macOS to pass in the vid and pid we want

pull/764/head
Jesse Vincent 5 years ago
parent e5558eaf90
commit bb83186214
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -125,7 +125,7 @@ if [ "${uname_S}" = "Darwin" ]; then
find_device_port() { find_device_port() {
DIR=$(dirname "$0") DIR=$(dirname "$0")
DEVICE_PORT_PROBER="${DIR}/find-device-port-macos" DEVICE_PORT_PROBER="${DIR}/find-device-port-macos"
DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER})" DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})"
} }
reset_device_cmd() { reset_device_cmd() {
@ -139,9 +139,15 @@ if [ "${uname_S}" = "Darwin" ]; then
MD5="md5" MD5="md5"
find_bootloader_ports() { find_bootloader_ports() {
find_device_vid_pid
DIR=$(dirname "$0") DIR=$(dirname "$0")
BOOTLOADER_VID="${BOOTLOADER_VID:-${VID}}"
DEVICE_PORT_PROBER="${DIR}/find-device-port-macos" DEVICE_PORT_PROBER="${DIR}/find-device-port-macos"
DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER})" if [[ "${DEVICE_PORT_BOOTLOADER}" = "" ]]; then
DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID})"
else
echo "DEVICE_PORT_BOOTLOADER=\"${DEVICE_PORT_BOOTLOADER}\" predefined."
fi
} }
elif [ "${uname_S}" = "FreeBSD" ]; then elif [ "${uname_S}" = "FreeBSD" ]; then

Loading…
Cancel
Save