diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2014-03-06 10:19:43 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2014-03-06 10:19:43 +0000 |
| commit | aca509e40dabc2b9cc88bcb2190a4ec56e9cb719 (patch) | |
| tree | c07f1ddc747cb866ef92510684f691184b9362fc /mk | |
| parent | 4af80d657dc4a17ac5dbee1dfb9f07f03d7060fc (diff) | |
| download | pkgsrc-aca509e40dabc2b9cc88bcb2190a4ec56e9cb719.tar.gz | |
Variable override is confusing.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/wrapper/wrapper.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/wrapper/wrapper.sh b/mk/wrapper/wrapper.sh index 4528129d501..6284b31a437 100644 --- a/mk/wrapper/wrapper.sh +++ b/mk/wrapper/wrapper.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: wrapper.sh,v 1.22 2013/04/21 03:51:27 uebayasi Exp $ +# $NetBSD: wrapper.sh,v 1.23 2014/03/06 10:19:43 uebayasi Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -125,18 +125,18 @@ yes) ;; esac -cmd="$cmd $libs" +cmdline="$cmd $libs" @_WRAP_ENV@ -msg_log $wrapperlog "<.>" "$cmd" +msg_log $wrapperlog "<.>" "$cmdline" if [ "${empty_file}" = "${cleanup}" ] && [ "$debug" != "yes" ]; then - eval "exec $cmd" + eval "exec $cmdline" wrapper_result=$? else wrapper_result=0 - eval "$cmd" || wrapper_result="$?" + eval "$cmdline" || wrapper_result="$?" fi . $cleanup @@ -144,7 +144,7 @@ fi [ $wrapper_result -eq 0 ] || [ "$debug" != "yes" ] || { echo "" echo "[wrapper.sh] note: The real command line, after the pkgsrc wrapper, was:" - echo "$cmd" + echo "$cmdline" } 1>&2 exit ${wrapper_result} |