diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index c8b1dd05..8c9c53f7 100644 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -19,6 +19,16 @@ set -e ###### Build and output configuration ###### + +identify_os() { + + +## Platform-specific overrides +# Shamelessly stolen from git's Makefile +uname_S=$(uname -s 2>/dev/null || echo not) +uname_O=$(uname -o 2>/dev/null || echo not) +} + absolute_filename() { echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")" } @@ -713,6 +723,7 @@ fi # shellcheck disable=SC2034 : "${KALEIDOSCOPE_BIN_DIR:=${KALEIDOSCOPE_DIR}/bin/}" +identify_os read_conf_files configure_arduino_cli_env diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index aa5865b3..e572b2a7 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -21,15 +21,6 @@ fi : "${FQBN:=keyboardio:${ARCH}:${BOARD}}" -######## -######## Host OS specific commands -######## - -## Platform-specific overrides -# Shamelessly stolen from git's Makefile -uname_S=$(uname -s 2>/dev/null || echo not) -uname_O=$(uname -o 2>/dev/null || echo not) - find_device_port() { if [ -n "${DEVICE_PORT}" ]; then echo "DEVICE_PORT=\"${DEVICE_PORT}\" predefined."