diff options
| -rw-r--r-- | scripts/scan-tools.sh | 10 | ||||
| -rwxr-xr-x | scripts/tar | 13 |
2 files changed, 3 insertions, 20 deletions
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index d2ed0e2f2..74c4f90c5 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -113,12 +113,6 @@ if [[ $X != *@(Native compiler works)* ]]; then fi rm test 2>/dev/null -if ! which tar >/dev/null 2>&1; then - echo You must install tar to continue. - echo - out=1 -fi - if ! which gzip >/dev/null 2>&1; then echo You must install gzip to continue. echo @@ -235,10 +229,12 @@ if ! which pkgconf >/dev/null 2>&1; then fi host_build_tar=0 -if ! which tar >/dev/null 2>&1; then +if which tar >/dev/null 2>&1; then if ! tar --version 2>/dev/null|grep GNU >/dev/null;then host_build_tar=1 fi +else + host_build_tar=1 fi host_build_findutils=0 diff --git a/scripts/tar b/scripts/tar deleted file mode 100755 index b696d5b92..000000000 --- a/scripts/tar +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -if [ -z "$(which gtar 2>/dev/null)" ];then - if [ -x /bin/tar ];then - /bin/tar "$@" - else - /usr/bin/tar "$@" - fi -else - gtar "$@" -fi |