|
|
@ -19,7 +19,7 @@ set -e
|
|
|
|
###### Build and output configuration
|
|
|
|
###### Build and output configuration
|
|
|
|
######
|
|
|
|
######
|
|
|
|
|
|
|
|
|
|
|
|
identify_os() {
|
|
|
|
_identify_os() {
|
|
|
|
## Platform-specific overrides
|
|
|
|
## Platform-specific overrides
|
|
|
|
# Shamelessly stolen from git's Makefile
|
|
|
|
# Shamelessly stolen from git's Makefile
|
|
|
|
uname_S=$(uname -s 2>/dev/null || echo not)
|
|
|
|
uname_S=$(uname -s 2>/dev/null || echo not)
|
|
|
@ -38,7 +38,7 @@ adjust_for_virtual_build() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
read_conf_files() {
|
|
|
|
_read_conf_files() {
|
|
|
|
for conf_file in \
|
|
|
|
for conf_file in \
|
|
|
|
"${HOME}/.kaleidoscope-builder.conf" \
|
|
|
|
"${HOME}/.kaleidoscope-builder.conf" \
|
|
|
|
"$(pwd)/.kaleidoscope-builder.conf" \
|
|
|
|
"$(pwd)/.kaleidoscope-builder.conf" \
|
|
|
@ -73,7 +73,7 @@ install_arduino_cli() {
|
|
|
|
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
|
|
|
|
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
configure_arduino_cli() {
|
|
|
|
_configure_arduino_cli() {
|
|
|
|
if [ -z "${ARDUINO_CLI}" ]; then
|
|
|
|
if [ -z "${ARDUINO_CLI}" ]; then
|
|
|
|
install_arduino_cli
|
|
|
|
install_arduino_cli
|
|
|
|
fi
|
|
|
|
fi
|
|
|
@ -471,9 +471,9 @@ fi
|
|
|
|
# shellcheck disable=SC2034
|
|
|
|
# shellcheck disable=SC2034
|
|
|
|
: "${KALEIDOSCOPE_BIN_DIR:=${KALEIDOSCOPE_DIR}/bin/}"
|
|
|
|
: "${KALEIDOSCOPE_BIN_DIR:=${KALEIDOSCOPE_DIR}/bin/}"
|
|
|
|
|
|
|
|
|
|
|
|
identify_os
|
|
|
|
_identify_os
|
|
|
|
read_conf_files
|
|
|
|
_read_conf_files
|
|
|
|
configure_arduino_cli_env
|
|
|
|
_configure_arduino_cli_env
|
|
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
|
|
|
|
|
|
|