diff options
| author | rillig <rillig@pkgsrc.org> | 2007-09-19 13:02:15 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-09-19 13:02:15 +0000 |
| commit | e446929efd70529c9e5149547576001be5b5c7d5 (patch) | |
| tree | 146836f46d42fc03a7b05f4434d992ba0762722c | |
| parent | b02bfd837a95f7269e85fc4fe7312b2bc45c0594 (diff) | |
| download | pkgsrc-e446929efd70529c9e5149547576001be5b5c7d5.tar.gz | |
Before and after the transformations, the commands are written to the
log file in a format that allows copy-and-paste into a shell. Before, it
wasn't possible to see from the log file whether a space was a delimiter
or part of a shell word.
| -rw-r--r-- | mk/wrapper/wrapper.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/wrapper/wrapper.sh b/mk/wrapper/wrapper.sh index b427dadb256..08e423add09 100644 --- a/mk/wrapper/wrapper.sh +++ b/mk/wrapper/wrapper.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: wrapper.sh,v 1.18 2007/05/19 17:25:56 rillig Exp $ +# $NetBSD: wrapper.sh,v 1.19 2007/09/19 13:02:15 rillig Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -85,7 +85,8 @@ yes) debug_log="msg_log" ;; *) debug_log=":" ;; esac -msg_log "$wrapperlog" "[*] $0 $*" +qcmd="$0"; for arg in ${1+"$@"}; do shquote "$arg"; qcmd="$qcmd $shquoted"; done +msg_log "$wrapperlog" "[*] $0 $qcmd" cmd="@WRAPPEE@" case "$*" in @@ -127,7 +128,7 @@ cmd="$cmd $libs" @_WRAP_ENV@ -eval "msg_log \$wrapperlog \"<.>\" $cmd" +msg_log $wrapperlog "<.>" "$cmd" wrapper_result=0 eval "$cmd" || wrapper_result="$?" |