summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig>2007-09-19 13:02:15 +0000
committerrillig <rillig>2007-09-19 13:02:15 +0000
commit4dbcd00b682463f7955ba5f083e54b88289de94e (patch)
tree146836f46d42fc03a7b05f4434d992ba0762722c /mk
parent654c1bfe0d8b535f3db58a1960b4654dd2c5caca (diff)
downloadpkgsrc-4dbcd00b682463f7955ba5f083e54b88289de94e.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.
Diffstat (limited to 'mk')
-rw-r--r--mk/wrapper/wrapper.sh7
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="$?"