Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/kyua-atf-compat/dist Cherry-pick upstream chang...



details:   https://anonhg.NetBSD.org/src/rev/7a92fb4d2c49
branches:  trunk
changeset: 785136:7a92fb4d2c49
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Mon Feb 25 18:49:51 2013 +0000

description:
Cherry-pick upstream change d0daf9983f5a0e635f1127dbc827aa114daa90d8:

Fix broken variable parsing with NetBSD's /bin/sh

Quote the expansion of a $() command that was not properly surrounded
by quotes so that this runs properly with NetBSD's /bin/sh.

diffstat:

 external/bsd/kyua-atf-compat/dist/atf-run.sh |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 479793baf7d3 -r 7a92fb4d2c49 external/bsd/kyua-atf-compat/dist/atf-run.sh
--- a/external/bsd/kyua-atf-compat/dist/atf-run.sh      Mon Feb 25 17:04:46 2013 +0000
+++ b/external/bsd/kyua-atf-compat/dist/atf-run.sh      Mon Feb 25 18:49:51 2013 +0000
@@ -66,11 +66,11 @@
         local ws='[ \t]*'
         local name='[a-zA-Z][-_a-zA-Z0-9]*'
         local repl="--variable='${prefix}\\1=\\2'"
-        local vars=$(grep "^${ws}${name}${ws}=" "${file}" | \
+        local vars="$(grep "^${ws}${name}${ws}=" "${file}" | \
             sed -e 's,#(.*)$,,;s,unprivileged-user,unprivileged_user,g' \
             -e "s,^${ws}\(${name}\)${ws}=${ws}'\([^']*\)'${ws}$,${repl}," \
             -e "s,^${ws}\(${name}\)${ws}=${ws}\"\([^\"]*\)\"${ws}$,${repl}," \
-            -e "s,^${ws}\(${name}\)${ws}=${ws}\(.*\)$,${repl},")
+            -e "s,^${ws}\(${name}\)${ws}=${ws}\(.*\)$,${repl},")"
 
         lib_info "Extracted arguments: ${vars}"
         all_vars="${all_vars} ${vars}"



Home | Main Index | Thread Index | Old Index