altomaltes / cross / slibtool

Forked from cross/slibtool 2 years ago
Clone

a408d8 build system: ccenv.sh: accommodate pattern caveats of old ash(1).

Authored and Committed by midipix 5 years ago
    build system: ccenv.sh: accommodate pattern caveats of old ash(1).
    
        
file modified
+13 -5
sofort/ccenv/ccenv.sh CHANGED
@@ -53,12 +53,15 @@ ccenv_find_tool()
53
53
if [ -z "$ccenv_prefixes" ]; then
54
54
for ccenv_tool in $ccenv_candidates; do
55
55
if [ -z ${@:-} ]; then
56
- command -v "$ccenv_tool" > /dev/null && \
56
+ if command -v "$ccenv_tool" > /dev/null; then
57
57
return 0
58
+ fi
58
59
else
59
- command -v "$ccenv_tool" > /dev/null && \
60
- "$ccenv_tool" $@ > /dev/null 2>&1 && \
60
+ if command -v "$ccenv_tool" > /dev/null; then
61
+ if "$ccenv_tool" $@ > /dev/null 2>&1; then
61
62
return 0
63
+ fi
64
+ fi
62
65
fi
63
66
done
64
67
@@ -70,12 +73,17 @@ ccenv_find_tool()
70
73
for ccenv_prefix in $ccenv_prefixes; do
71
74
for ccenv_candidate in $ccenv_candidates; do
72
75
ccenv_tool="$ccenv_prefix$ccenv_candidate"
73
- command -v "$ccenv_tool" > /dev/null && return 0
76
+
77
+ if command -v "$ccenv_tool" > /dev/null; then
78
+ return 0
79
+ fi
74
80
done
75
81
done
76
82
77
83
for ccenv_tool in $ccenv_candidates; do
78
- command -v "$ccenv_tool" > /dev/null && return 0
84
+ if command -v "$ccenv_tool" > /dev/null; then
85
+ return 0
86
+ fi
79
87
done
80
88
81
89
ccenv_tool=false