From a85b17d115a9ed640d7506002a74e3d75683a4aa Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 13 Jan 2019 22:07:41 +0200 Subject: [PATCH] build.sh: OS_ vars are now uppercase --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index ab9791ee18..d1d3a4866a 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ board=$1 target=${*:2} cd $(dirname $0) basedir=$(pwd) -gzip=$(which pigz || which gzip) +gzip=$(which pigz 2> /dev/null || which gzip 2> /dev/null) # extra environment from local file test -f $basedir/.build-env && source $basedir/.build-env @@ -26,14 +26,14 @@ test -f $basedir/.build-env && source $basedir/.build-env if [ -n "$THINGOS_SHORT_NAME" ]; then osname=$THINGOS_SHORT_NAME else - osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name) + osname=$(source $basedir/board/common/overlay/etc/version && echo $OS_SHORT_NAME) fi # OS version if [ -n "$THINGOS_VERSION" ]; then osversion=$THINGOS_VERSION else - osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version) + osversion=$(source $basedir/board/common/overlay/etc/version && echo $OS_VERSION) fi # when the special "boards" keyword is used for board, simply list all known boards