From 10b845035bd87295d3071d711af04ae8ba4d994f Mon Sep 17 00:00:00 2001 From: midipix Date: Thu, 17 Oct 2019 03:00:22 +0000 Subject: build system: ccenv.sh: accommodate pattern caveats of old ash(1). --- sofort/ccenv/ccenv.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'sofort/ccenv/ccenv.sh') diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index e56b452..3295bc4 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -53,12 +53,15 @@ ccenv_find_tool() if [ -z "$ccenv_prefixes" ]; then for ccenv_tool in $ccenv_candidates; do if [ -z ${@:-} ]; then - command -v "$ccenv_tool" > /dev/null && \ + if command -v "$ccenv_tool" > /dev/null; then return 0 + fi else - command -v "$ccenv_tool" > /dev/null && \ - "$ccenv_tool" $@ > /dev/null 2>&1 && \ + if command -v "$ccenv_tool" > /dev/null; then + if "$ccenv_tool" $@ > /dev/null 2>&1; then return 0 + fi + fi fi done @@ -70,12 +73,17 @@ ccenv_find_tool() for ccenv_prefix in $ccenv_prefixes; do for ccenv_candidate in $ccenv_candidates; do ccenv_tool="$ccenv_prefix$ccenv_candidate" - command -v "$ccenv_tool" > /dev/null && return 0 + + if command -v "$ccenv_tool" > /dev/null; then + return 0 + fi done done for ccenv_tool in $ccenv_candidates; do - command -v "$ccenv_tool" > /dev/null && return 0 + if command -v "$ccenv_tool" > /dev/null; then + return 0 + fi done ccenv_tool=false -- cgit v1.2.3