move identify_os into the builder

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 9699eb198e
commit 50f66a5b10
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -19,6 +19,16 @@ set -e
###### Build and output configuration ###### 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() { absolute_filename() {
echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")" echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
} }
@ -713,6 +723,7 @@ fi
# shellcheck disable=SC2034 # shellcheck disable=SC2034
: "${KALEIDOSCOPE_BIN_DIR:=${KALEIDOSCOPE_DIR}/bin/}" : "${KALEIDOSCOPE_BIN_DIR:=${KALEIDOSCOPE_DIR}/bin/}"
identify_os
read_conf_files read_conf_files
configure_arduino_cli_env configure_arduino_cli_env

@ -21,15 +21,6 @@ fi
: "${FQBN:=keyboardio:${ARCH}:${BOARD}}" : "${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() { find_device_port() {
if [ -n "${DEVICE_PORT}" ]; then if [ -n "${DEVICE_PORT}" ]; then
echo "DEVICE_PORT=\"${DEVICE_PORT}\" predefined." echo "DEVICE_PORT=\"${DEVICE_PORT}\" predefined."

Loading…
Cancel
Save