From 82087e4f2ccf6d63df9928069c90c17154b9b09f Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 14 Nov 2020 18:10:57 -0800 Subject: [PATCH] we're not really using os identifcation globally any more. move it to just one place --- bin/kaleidoscope-builder | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 1eed63ff..31ab3daa 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -19,13 +19,6 @@ set -e ###### 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) -} - _read_conf_files() { for conf_file in \ @@ -92,6 +85,7 @@ _arduino_props() { _set_executable_paths() { + uname_S=$(uname -s 2>/dev/null || echo not) if [ "${ARCH}" = "virtual" ]; then if [ "${uname_S}" = "FreeBSD" ]; then @@ -354,7 +348,6 @@ if [ $# -lt 1 ]; then exit 1 fi -_identify_os _read_conf_files _configure_arduino_cli_env