From 354b356fea4bc54975b69ca00ae3b106055ddc54 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 4 Nov 2019 21:57:36 +0100 Subject: [PATCH] update --- README.MD | 2 +- danio_gcc.sh | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.MD b/README.MD index b6ebf78..18a77fd 100644 --- a/README.MD +++ b/README.MD @@ -16,4 +16,4 @@ and wait several hours to compile for many arches (look at `.travis.yml`) --- -[My continuous untegration at Travis-CI](https://travis-ci.com/danielkot/danio-gcc) +[My continuous integration at Travis-CI](https://travis-ci.com/danielkot/danio-gcc) diff --git a/danio_gcc.sh b/danio_gcc.sh index 51ccf81..29427d9 100755 --- a/danio_gcc.sh +++ b/danio_gcc.sh @@ -199,11 +199,11 @@ fi targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`" if [ "${AUTOBUILD}" -ne "0" ]; then export clean="1" - export binutils_version="master" - export glibc_version="master" - export linux_version="master" - export gcc_version="master" - export newlib_version="master" + [ -z "${binutils_version}" ] && export binutils_version="master" + [ -z "${glibc_version}" ] && export glibc_version="master" + [ -z "${linux_version}" ] && export linux_version="master" + [ -z "${gcc_version}" ] && export gcc_version="master" + [ -z "${newlib_version}" ] && export newlib_version="master" if [ "${METHOD}" = "newlib" ]; then export buildnewlib="1" for i in ${targets}; do @@ -319,11 +319,11 @@ else fi done else - export binutils_version="master" - export glibc_version="master" - export linux_version="master" - export gcc_version="master" + [ -z "${binutils_version}" ] && export binutils_version="master" + [ -z "${glibc_version}" ] && export glibc_version="master" + [ -z "${linux_version}" ] && export linux_version="master" + [ -z "${gcc_version}" ] && export gcc_version="master" fi - export newlib_version="master" + [ -z "${newlib_version}" ] && export newlib_version="master" runit "${arch}-danio-${BASE}" "${BINARY}" fi