[tor-commits] [torsocks/issue-47] spawn a shell with --shell and not "shell"

[ioerror at torproject.org]

commit c828075df50912711686bf96de7370927dfb4c0b
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Tue Nov 6 17:33:08 2012 -0800

    spawn a shell with --shell and not "shell"
    
    This updates documentation to match the implementation
    This is addressed as issue 47:
    
      http://code.google.com/p/torsocks/issues/detail?id=47
---
 doc/torsocks.1.in |    4 +++-
 src/torsocks.in   |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/torsocks.1.in b/doc/torsocks.1.in
index b383859..4ceba4c 100644
--- a/doc/torsocks.1.in
+++ b/doc/torsocks.1.in
@@ -10,7 +10,7 @@ transparently allow an application to use a SOCKS proxy. Basically a renamed, pa
 .br
 or
 .B torsocks
-.RB [on|off]
+.RB [on|off|--shell]
 .br
 or
 .B torsocks
@@ -56,6 +56,8 @@ Example:
 show the current value of the LD_PRELOAD variable
 .IP \fB<without\ any\ argument>
 create a new shell with LD_PRELOAD including torsocks(8).
+.IP \fB[--shell]
+create a new shell with LD_PRELOAD including torsocks(8).
 .PP
 .SH AUTHOR
 This script was created by Tamas SZERB <toma at rulez.org> for the debian
diff --git a/src/torsocks.in b/src/torsocks.in
index b42364f..f1052cc 100755
--- a/src/torsocks.in
+++ b/src/torsocks.in
@@ -111,7 +111,7 @@ case "$1" in
   -h|-?)
       echo "$0: Please see torsocks(1) or read comment at top of $0"
    ;;
-  --shell|shell)
+  --shell)
     if [ -z "$@LDPRELOAD@" ]
     then
       export @LDPRELOAD@="${SHLIB}"