@matheusbsbs / matheus-bagliano / commits / e817e3e857
Fork 0

sh-setup: don't let eval output to be shell-expanded.

The previous patch missed the same construct in git-clone. Signed-off-by: Pierre Habouzit <madcoder@debian.org>

Pierre Habouzit committed Nov 8, 2007 at 10:32 UTC e817e3e8579742312534f20c0946cd3c562cfa7c
2 files changed +9 -6
git-clone.sh
+1 -1
@@ -36,7 +36,7 @@ usage() {
36 exec "$0" -h
37 }
38
39 -eval `echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`
39 +eval "$(echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
40
41 get_repo_base() {
42 (
git-sh-setup.sh
+8 -5
@@ -21,12 +21,15 @@ if test -n "$OPTIONS_SPEC"; then
21 exec "$0" -h
22 }
23
24 - [ -n "$OPTIONS_KEEPDASHDASH" ] && parseopt_extra="--keep-dashdash"
25 - parsed=$(
24 + parseopt_extra=
25 + [ -n "$OPTIONS_KEEPDASHDASH" ] &&
26 + parseopt_extra="--keep-dashdash"
27 +
28 + eval "$(
29 echo "$OPTIONS_SPEC" |
27 - git rev-parse --parseopt $parseopt_extra -- "$@"
28 - ) &&
29 - eval "$parsed" || exit
30 + git rev-parse --parseopt $parseopt_extra -- "$@" ||
31 + echo exit $?
32 + )"
33 else
34 usage() {
35 die "Usage: $0 $USAGE"