From 139cc36c4f24dbc8c759f6bc3fba536698db6e03 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 25 Feb 2014 01:48:14 -0500 Subject: Fix fakeroot and remap parsing corner cases Fix case when $PWD contains spaces. Pass directly arguments to command, to directly avoid escaping issues. Based on suggestion by Ivan Shmakov * utils/fakeroot.sh (TARGET): Do not define. (sh): Rather pass PWD and commandline as parameters. * utils/remap.sh: Likewise. --- utils/remap.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'utils/remap.sh') diff --git a/utils/remap.sh b/utils/remap.sh index 064f0f5f..f24ed0e7 100644 --- a/utils/remap.sh +++ b/utils/remap.sh @@ -57,16 +57,11 @@ if [ $# -eq 0 ]; then set -- ${SHELL:-/bin/sh} fi -TARGET= -until [ $# -eq 0 ]; do - TARGET="${TARGET} '$(echo "$1" | sed -e "s/'/'\\\\''/g")'" - shift -done - # We exec settrans, which execs the "fakeauth" command in the chroot context. # The `pwd` is evaluated here and now, and that result interpreted inside # the shell running under fakeauth to chdir there inside the chroot world. # That shell then execs our arguments as a command line. exec /bin/settrans --chroot \ - /bin/sh -c "cd `pwd`; exec ${TARGET}" \ + /bin/sh -c 'cd "$1" || exit ; shift ; exec "$@"' \ + "$1" "$PWD" "$@" \ -- / /hurd/remap $MAPPED -- cgit v1.2.3