Merge pull request #818 from indirect/macos-device-cleanup

macOS device cleanup
pull/764/head
Jesse Vincent 5 years ago committed by GitHub
commit 08ee5fbfe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -12,7 +12,7 @@ my $pid = shift @ARGV;
# ioreg might be more machine-readable than system_profiler, but I haven't been able to
# get it to produce useful output
my @output = qx(/usr/sbin/system_profiler SPUSBDataType);
my @output = qx(/usr/sbin/system_profiler SPUSBDataType 2> /dev/null);
my $serial = "";
my $location = "";

@ -291,8 +291,14 @@ hex_with_bootloader () {
}
maybe_build () {
build_version
build_paths
build_filenames
if [ ! -e "${HEX_FILE_PATH}" ]; then
build "$@"
else
SKETCH_DIR="$(find_sketch)"
fi
}
@ -609,7 +615,7 @@ fi
# shellcheck disable=SC1090
. "${ROOT}/etc/kaleidoscope-builder.conf"
if [ -n "${VERBOSE}" ] && [ "${VERBOSE}" -gt 0 ]; then
if [ -n "${VERBOSE}" ] && [[ "${VERBOSE}" -gt 0 ]]; then
ARDUINO_VERBOSE="-verbose"
else
ARDUINO_VERBOSE="-quiet"

Loading…
Cancel
Save