From fff5dce19962400ecf0fc02cee170f8cc4631af0 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Thu, 24 Sep 2020 12:14:52 +0200 Subject: [PATCH] kaleidoscope-builder: Whitespace cleanup Signed-off-by: Gergely Nagy --- bin/kaleidoscope-builder | 36 +++++++++++++++++------------------ etc/kaleidoscope-builder.conf | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index a323d063..6d254ce7 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -61,31 +61,31 @@ enable_ccache () { if ! [ -d "$CCACHE_WRAPPER_PATH" ]; then mkdir -p "$CCACHE_WRAPPER_PATH" fi - + if ! [ -h "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}${C_COMPILER_BASENAME}" ]; then ln -s "$(command -v ccache)" "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}${C_COMPILER_BASENAME}" fi - + if ! [ -h "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}${CXX_COMPILER_BASENAME}" ]; then ln -s "$(command -v ccache)" "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}${CXX_COMPILER_BASENAME}" fi - + if ! [ -h "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}nm" ]; then ln -s "${AVR_NM}" "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}nm" fi - + if ! [ -h "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}objcopy" ]; then ln -s "${AVR_OBJCOPY}" "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}objcopy" fi - + if ! [ -h "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}ar" ]; then ln -s "${AVR_AR}" "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}ar" fi - + if ! [ -h "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}size" ]; then ln -s "${AVR_SIZE}" "${CCACHE_WRAPPER_PATH}/${COMPILER_PREFIX}size" fi - + export CCACHE_PATH=${COMPILER_PATH}/ CCACHE_ENABLE="-prefs compiler.path=${CCACHE_WRAPPER_PATH}/" fi @@ -163,16 +163,16 @@ prompt_before_flashing () { flash () { maybe_build "$@" - # 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 find_bootloader_ports if [ -z "${DEVICE_PORT_BOOTLOADER}" ]; then prompt_before_flashing - + # This is defined in the (optional) user config. # shellcheck disable=SC2154 ${preFlash_HOOKS} - + # If we're -not- doing a manual reset, then try to do it automatically if [ -z "${MANUAL_RESET}" ]; then reset_device @@ -195,7 +195,7 @@ flash () { wait_for_bootloader_port() { declare -i tries tries=15 - + while [ "$tries" -gt 0 ] && [ -z "${DEVICE_PORT_BOOTLOADER}" ]; do sleep 1 printf "." @@ -204,12 +204,12 @@ wait_for_bootloader_port() { # shellcheck disable=SC2004 tries=$(($tries-1)) done - + if [ "$tries" -gt 0 ]; then echo "Found." - else + else echo "Timed out." - fi + fi } check_bootloader_port () { @@ -227,11 +227,11 @@ check_bootloader_port_and_flash () { if ! check_bootloader_port; then return 1 fi - + echo "Flashing your keyboard:" # If the flash fails, try a second time - if ! flash_over_usb; then + if ! flash_over_usb; then sleep 2 if ! flash_over_usb; then if [ "${ARDUINO_VERBOSE}" != "-verbose" ]; then @@ -341,7 +341,7 @@ compile () { enable_ccache install -d "${OUTPUT_PATH}" - + SKETCH_DIR="$(find_sketch)" echo "Building ${SKETCH_DIR}/${SKETCH} ${LIB_VERSION} into ${OUTPUT_PATH}" @@ -362,7 +362,7 @@ compile () { # We want literal backslashes here, not arrays. ARDUINO_PACKAGES="-hardware \"${ARDUINO_PACKAGE_PATH}\"" fi - + SAVED_BOARD="${BOARD}" SAVED_FQBN="${FQBN}" if [ -e "${SKETCH_DIR}/.kaleidoscope-builder.conf" ]; then diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index 37050040..05326307 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -19,7 +19,7 @@ fi if [ "${ARCH}" = "virtual" ]; then FQBN="${FQBN:-keyboardio:virtual:${BOARD}}" - + # Set the compiler path for virtual builds # if [ -z "${COMPILER_PATH}" ]; then