diff options
| author | midipix <writeonce@midipix.org> | 2019-10-20 00:17:44 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2019-10-20 00:22:03 +0000 |
| commit | 3ff715de049f1e4bb981f69bf157e02f1677f93a (patch) | |
| tree | 5a124eba9c3c325c21e10190b766f608deba5d0b | |
| parent | 171adf738bf8f55124e4aaf82c2e87848107d4e7 (diff) | |
| download | ntcon-3ff715de049f1e4bb981f69bf157e02f1677f93a.tar.bz2 ntcon-3ff715de049f1e4bb981f69bf157e02f1677f93a.tar.xz | |
build system: ccenv.sh: support shells with private loop iteration variables.
| -rw-r--r-- | sofort/ccenv/ccenv.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index d6f48f2..e28a1fb 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -51,14 +51,16 @@ ccenv_comment() ccenv_find_tool() { if [ -z "$ccenv_prefixes" ]; then - for ccenv_tool in $(printf %s "$ccenv_candidates"); do + for ccenv_candidate in $(printf %s "$ccenv_candidates"); do if [ -z ${@:-} ]; then - if command -v "$ccenv_tool" > /dev/null; then + if command -v "$ccenv_candidate" > /dev/null; then + ccenv_tool="$ccenv_candidate" return 0 fi else - if command -v "$ccenv_tool" > /dev/null; then - if "$ccenv_tool" $@ > /dev/null 2>&1; then + if command -v "$ccenv_candidate" > /dev/null; then + if "$ccenv_candidate" $@ > /dev/null 2>&1; then + ccenv_tool="$ccenv_candidate" return 0 fi fi @@ -80,8 +82,9 @@ ccenv_find_tool() done done - for ccenv_tool in $(printf %s "$ccenv_candidates"); do - if command -v "$ccenv_tool" > /dev/null; then + for ccenv_candidate in $(printf %s "$ccenv_candidates"); do + if command -v "$ccenv_candidate" > /dev/null; then + ccenv_tool="$ccenv_candidate" return 0 fi done |