alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #625 from CapeLeidokos/ng_whitespace_fix

Browse Source 
Fixed Kaleidoscope Builder for Arduino paths containing whitespaces
pull/632/head
Jesse Vincent 6 years ago committed by GitHub
parent 8fe381a0a2 2cad17b07b
commit 86bf5bdfab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File

4
bin/kaleidoscope-builder
Unescape View File

@ -261,12 +261,12 @@ compile () {
# SC2091: We do not care if quotes or backslashes are not respected. # SC2091: We do not care if quotes or backslashes are not respected.
# SC2086: We want word splitting. # SC2086: We want word splitting.
# shellcheck disable=SC2086,SC2090 # shellcheck disable=SC2086,SC2090
${ARDUINO_BUILDER} \ "${ARDUINO_BUILDER}" \
-compile \ -compile \
${ARDUINO_PACKAGES} \ ${ARDUINO_PACKAGES} \
-hardware "${ARDUINO_PATH}/hardware" \ -hardware "${ARDUINO_PATH}/hardware" \
-hardware "${BOARD_HARDWARE_PATH}" \ -hardware "${BOARD_HARDWARE_PATH}" \
${ARDUINO_TOOLS_PARAM} \ ${ARDUINO_TOOLS_FLAG:+"${ARDUINO_TOOLS_FLAG}"} ${ARDUINO_TOOLS_PARAM:+"${ARDUINO_TOOLS_PARAM}"} \
-tools "${ARDUINO_PATH}/tools-builder" \ -tools "${ARDUINO_PATH}/tools-builder" \
-fqbn "${FQBN}" \ -fqbn "${FQBN}" \
-libraries "." \ -libraries "." \

11
etc/kaleidoscope-builder.conf
Unescape View File

@ -27,10 +27,10 @@ fi
uname_S=$(uname -s 2>/dev/null || echo not) uname_S=$(uname -s 2>/dev/null || echo not)
find_max_prog_size() { find_max_prog_size() {
VPIDS=$(${ARDUINO_BUILDER} \ VPIDS=$("${ARDUINO_BUILDER}" \
-hardware "${ARDUINO_PATH}/hardware" \ -hardware "${ARDUINO_PATH}/hardware" \
-hardware "${BOARD_HARDWARE_PATH}" \ -hardware "${BOARD_HARDWARE_PATH}" \
${ARDUINO_TOOLS_PARAM} \ ${ARDUINO_TOOLS_FLAG:+"${ARDUINO_TOOLS_FLAG}"} ${ARDUINO_TOOLS_PARAM:+"${ARDUINO_TOOLS_PARAM}"} \
-tools "${ARDUINO_PATH}/tools-builder" \ -tools "${ARDUINO_PATH}/tools-builder" \
-fqbn "${FQBN}" \ -fqbn "${FQBN}" \
-dump-prefs | grep "upload\.maximum_size=") -dump-prefs | grep "upload\.maximum_size=")
@ -38,10 +38,10 @@ find_max_prog_size() {
} }
find_device_vid_pid() { find_device_vid_pid() {
VPIDS=$(${ARDUINO_BUILDER} \ VPIDS=$("${ARDUINO_BUILDER}" \
-hardware "${ARDUINO_PATH}/hardware" \ -hardware "${ARDUINO_PATH}/hardware" \
-hardware "${BOARD_HARDWARE_PATH}" \ -hardware "${BOARD_HARDWARE_PATH}" \
${ARDUINO_TOOLS_PARAM} \ ${ARDUINO_TOOLS_FLAG:+"${ARDUINO_TOOLS_FLAG}"} ${ARDUINO_TOOLS_PARAM:+"${ARDUINO_TOOLS_PARAM}"} \
-tools "${ARDUINO_PATH}/tools-builder" \ -tools "${ARDUINO_PATH}/tools-builder" \
-fqbn "${FQBN}" \ -fqbn "${FQBN}" \
-dump-prefs | grep "\.[vp]id=") -dump-prefs | grep "\.[vp]id=")
@ -166,7 +166,8 @@ BOARD_HARDWARE_PATH="${BOARD_HARDWARE_PATH:-${ARDUINO_LOCAL_LIB_PATH}/hardware}"
BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/caterina/Caterina.hex}" BOOTLOADER_PATH="${BOOTLOADER_PATH:-${BOARD_HARDWARE_PATH}/keyboardio/avr/bootloaders/caterina/Caterina.hex}"
if [ ! -z "${ARDUINO_TOOLS_PATH}" ]; then if [ ! -z "${ARDUINO_TOOLS_PATH}" ]; then
ARDUINO_TOOLS_PARAM="-tools ${ARDUINO_TOOLS_PATH}" ARDUINO_TOOLS_PARAM="${ARDUINO_TOOLS_PATH}"
ARDUINO_TOOLS_FLAG="-tools"
fi fi
if [ ! -z "${AVR_GCC_PREFIX}" ]; then if [ ! -z "${AVR_GCC_PREFIX}" ]; then

Write Preview
Loading…
Cancel
Save