From 67e50c2590127bb2b9b2a60cdbb1a84e56c142e2 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 14 Nov 2020 17:49:13 -0800 Subject: [PATCH] Minor refactoring for clarity --- bin/kaleidoscope-builder | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 562c8d2d..9baef7c9 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -136,16 +136,19 @@ _set_build_paths() { # We need that echo because we\re piping to cksum # shellcheck disable=SC2005 SKETCH_IDENTIFIER="$(echo "${SKETCH_FILE_PATH}" | cksum | cut -d ' ' -f 1)-${SKETCH_FILE_NAME}" + : "${KALEIDOSCOPE_TEMP_PATH:=${TMPDIR:-/tmp}/kaleidoscope-${USER}}" - : "${KALEIDOSCOPE_BUILD_PATH:=${KALEIDOSCOPE_TEMP_PATH}/sketch}" - : "${KALEIDOSCOPE_OUTPUT_PATH:=${KALEIDOSCOPE_TEMP_PATH}/sketch}" + : "${KALEIDOSCOPE_BUILD_PATH:=${KALEIDOSCOPE_TEMP_PATH}/build}" + : "${KALEIDOSCOPE_OUTPUT_PATH:=${KALEIDOSCOPE_TEMP_PATH}/output}" - : "${SKETCH_OUTPUT_DIR:=${SKETCH_IDENTIFIER}/output}" : "${SKETCH_BUILD_DIR:=${SKETCH_IDENTIFIER}/build}" + : "${SKETCH_OUTPUT_DIR:=${SKETCH_IDENTIFIER}/output}" : "${BUILD_PATH:=${KALEIDOSCOPE_BUILD_PATH}/${SKETCH_BUILD_DIR}}" : "${OUTPUT_PATH:=${KALEIDOSCOPE_OUTPUT_PATH}/${SKETCH_OUTPUT_DIR}}" + + : "${CORE_CACHE_PATH:=${KALEIDOSCOPE_TEMP_PATH}/arduino-cores}"