sanitized bash wrapper scripts, reformulated BUGS section in manual

3 files changed, 14 insertions, 15 deletions

diff --git a/doc/ranger.1 b/doc/ranger.1
index 981aa115..2ad3d9c0 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -715,9 +715,9 @@ original one.
 \& function ranger\-cd {
 \&   tempfile=\*(Aq/tmp/chosendir\*(Aq
 \&   /usr/bin/ranger \-\-choosedir="$tempfile" "${@:\-$(pwd)}"
-\&   if [ \-f "$tempfile" \-a "$(cat "$tempfile")" != "$(pwd | tr \-d "\en")" ]; then
-\&     cd "$(cat "$tempfile")"
-\&     rm "$tempfile"
+\&   if [ \-f "$tempfile" \-a "$(cat \-\- "$tempfile")" != "$(echo \-n \`pwd\`)" ]; then
+\&     cd \-\- "$(cat "$tempfile")"
+\&     rm \-f \-\- "$tempfile"
 \&   fi
 \& }
 \&
@@ -746,7 +746,7 @@ copy, run:
 .Ve
 .SH "BUGS"
 .IX Header "BUGS"
-Please report bugs here: <http://savannah.nongnu.org/bugs/?group=ranger>
+Report bugs here: <http://savannah.nongnu.org/bugs/?group=ranger>
 .PP
-In many cases, ranger prints more diagnostics information when you run it with
-the \fB\-\-debug\fR option. Please include as much relevant information as possible.
+Please include as much relevant information as possible.  For the most
+diagnostic output, run ranger like this: \f(CW\*(C`PYTHONOPTIMIZE= ranger \-\-debug\*(C'\fR
diff --git a/doc/ranger.pod b/doc/ranger.pod
index b59f7a40..ddd8dada 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -785,9 +785,9 @@ original one.
  function ranger-cd {
    tempfile='/tmp/chosendir'
    /usr/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}"
-   if [ -f "$tempfile" -a "$(cat "$tempfile")" != "$(pwd | tr -d "\n")" ]; then
-     cd "$(cat "$tempfile")"
-     rm "$tempfile"
+   if [ -f "$tempfile" -a "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
+     cd -- "$(cat "$tempfile")"
+     rm -f -- "$tempfile"
    fi
  }
 
@@ -826,8 +826,7 @@ copy, run:
 
 =head1 BUGS
 
-Please report bugs here: L<http://savannah.nongnu.org/bugs/?group=ranger>
-
-In many cases, ranger prints more diagnostics information when you run it with
-the B<--debug> option. Please include as much relevant information as possible.
+Report bugs here: L<http://savannah.nongnu.org/bugs/?group=ranger>
 
+Please include as much relevant information as possible.  For the most
+diagnostic output, run ranger like this: C<PYTHONOPTIMIZE= ranger --debug>
diff --git a/ranger.py b/ranger.py
index cc402a44..f4962093 100755
--- a/ranger.py
+++ b/ranger.py
@@ -23,9 +23,9 @@ if [ ! -z "$1" ]; then
 	ranger="$1"
 	shift
 	"$ranger" --choosedir="$tempfile" "${@:-$(pwd)}"
-	if [ -f "$tempfile" -a "$(cat "$tempfile")" != "$(pwd | tr -d "\n")" ]; then
+	if [ -f "$tempfile" -a "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
 		cd "$(cat "$tempfile")"
-		rm "$tempfile"
+		rm -f -- "$tempfile"
 	fi && return 0
 else
 	echo "usage: source path/to/ranger.py path/to/ranger.py"