Clean up logic for choosing where our arduino-cli comes from

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

@ -687,11 +687,9 @@ fi
SYSTEM_ARDUINO_CLI="$(command -v arduino-cli || true )" SYSTEM_ARDUINO_CLI="$(command -v arduino-cli || true )"
if [ "x${SYSTEM_ARDUINO_CLI}" == "x" ]; then if [ -z "${SYSTEM_ARDUINO_CLI}" ]; then
echo "Using our own arduino-cli"
: "${ARDUINO_CLI:=${KALEIDOSCOPE_BIN_DIR}/arduino-cli}" : "${ARDUINO_CLI:=${KALEIDOSCOPE_BIN_DIR}/arduino-cli}"
else else
echo "Using system arduino-cli from ${SYSTEM_ARDUINO_CLI}"
: "${ARDUINO_CLI:=${SYSTEM_ARDUINO_CLI}}" : "${ARDUINO_CLI:=${SYSTEM_ARDUINO_CLI}}"
fi fi
@ -701,9 +699,7 @@ fi
: "${ARDUINO_DIRECTORIES_DATA:=${ARDUINO_CONTENT}/data}" : "${ARDUINO_DIRECTORIES_DATA:=${ARDUINO_CONTENT}/data}"
: "${ARDUINO_DIRECTORIES_DOWNLOADS:=${ARDUINO_CONTENT}/downloads}" : "${ARDUINO_DIRECTORIES_DOWNLOADS:=${ARDUINO_CONTENT}/downloads}"
: "${ARDUINO_DIRECTORIES_USER:=${ARDUINO_CONTENT}/user}" : "${ARDUINO_DIRECTORIES_USER:=${ARDUINO_CONTENT}/user}"
: "${ARDUINO_CLI_CONFIG:=${ARDUINO_DIRECTORIES_DATA}/arduino-cli.yaml}" : "${ARDUINO_CLI_CONFIG:=${ARDUINO_DIRECTORIES_DATA}/arduino-cli.yaml}"
: "${ARDUINO_BOARDS_MANAGER_KALEIDOSCOPE:=https://raw.githubusercontent.com/keyboardio/boardsmanager/master/package_keyboardio_index.json}" : "${ARDUINO_BOARDS_MANAGER_KALEIDOSCOPE:=https://raw.githubusercontent.com/keyboardio/boardsmanager/master/package_keyboardio_index.json}"
# shellcheck disable=SC2155 # shellcheck disable=SC2155

Loading…
Cancel
Save