From 54771ad718e1f97372404bf8151324e3a6f9ce7f Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Wed, 4 Oct 2017 23:52:56 -0700 Subject: [PATCH] fix the package path to be less platform dependent --- bin/kaleidoscope-builder | 4 ++-- etc/kaleidoscope-builder.conf | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 9f810e8d..087e8c87 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -126,8 +126,8 @@ compile () { fi ARDUINO_PACKAGES="" - if [ -d "${HOME}/.arduino15/packages" ]; then - ARDUINO_PACKAGES="-hardware \"${HOME}/.arduino15/packages\"" + if [ -d ${ARDUINO_PACKAGE_PATH} ]; then + ARDUINO_PACKAGES="-hardware \"${ARDUINO_PACKAGE_PATH}\"" fi ${ARDUINO_BUILDER} \ diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index 2a30b9de..1846edb5 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -54,6 +54,7 @@ if [ "${uname_S}" = "Darwin" ]; then ARDUINO_PATH="${ARDUINO_PATH:-/Applications/Arduino.app/Contents/Java/}" + ARDUINO_PACKAGE_PATH="${ARDUINO_PACKAGE_PATH:-${HOME}/Library/Arduino15/packages}" ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Documents/Arduino}" MD5="md5" @@ -79,6 +80,8 @@ fi ARDUINO_PATH="${ARDUINO_PATH:-/usr/local/arduino}" ARDUINO_LOCAL_LIB_PATH="${ARDUINO_LOCAL_LIB_PATH:-${HOME}/Arduino}" ARDUINO_TOOLS_PATH="${ARDUINO_TOOLS_PATH:-${ARDUINO_PATH}/hardware/tools}" +ARDUINO_PACKAGE_PATH="${ARDUINO_PACKAGE_PATH:-${HOME}/.arduino15/packages}" + ARDUINO_BUILDER="${ARDUINO_BUILDER:-${ARDUINO_PATH}/arduino-builder}" ARDUINO_IDE_VERSION="100607"