move a var up to where we set the vars

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

@ -165,6 +165,7 @@ _set_build_paths() {
)${GIT_VERSION}" )${GIT_VERSION}"
: "${BOOTLOADER_PATH:=$(_arduino_prop 'runtime.platform.path')/bootloaders/$(_arduino_prop 'bootloader.file')}"
: "${OUTPUT_FILE_PREFIX:=${SKETCH_BASE_NAME}-${LIB_VERSION}}" : "${OUTPUT_FILE_PREFIX:=${SKETCH_BASE_NAME}-${LIB_VERSION}}"
: "${HEX_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.hex}" : "${HEX_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.hex}"
: "${HEX_FILE_WITH_BOOTLOADER_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}-with-bootloader.hex}" : "${HEX_FILE_WITH_BOOTLOADER_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}-with-bootloader.hex}"
@ -237,19 +238,13 @@ cmd_flash() {
#but it's short some of the data we kind of need #but it's short some of the data we kind of need
port=$(_run_arduino_cli board list --format=text | grep "$FQBN" |cut -d' ' -f 1) port=$(_run_arduino_cli board list --format=text | grep "$FQBN" |cut -d' ' -f 1)
_prompt_before_flashing _prompt_before_flashing
_run_arduino_cli upload \ _run_arduino_cli upload --fqbn "${FQBN}" --port "${port}" "${ARDUINO_VERBOSE}"
--fqbn "${FQBN}" \
--port "${port}" \
"${ARDUINO_VERBOSE}"
# This is defined in the (optional) user config.
# shellcheck disable=SC2154
} }
cmd_hex_with_bootloader() { cmd_hex_with_bootloader() {
_set_up_environment _set_up_environment
: "${BOOTLOADER_PATH:=$(_arduino_prop 'runtime.platform.path')/bootloaders/$(_arduino_prop 'bootloader.file')}"
awk '/^:00000001FF/ == 0' "${HEX_FILE_PATH}" >"${HEX_FILE_WITH_BOOTLOADER_PATH}" awk '/^:00000001FF/ == 0' "${HEX_FILE_PATH}" >"${HEX_FILE_WITH_BOOTLOADER_PATH}"
echo "Using ${BOOTLOADER_PATH}" echo "Using ${BOOTLOADER_PATH}"

Loading…
Cancel
Save