diff options
| author | hut <hut@lavabit.com> | 2011-09-28 23:38:23 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-09-28 23:38:23 +0200 |
| commit | bdc872b0178be74059f49d8878b5c05f2d7ed8ce (patch) | |
| tree | 604a2f93103dbc1fa2a09a84cee3d8d46b6b60f4 | |
| parent | 0da832e8c47261fed2e91463699f6505ba3269fa (diff) | |
| download | ranger-bdc872b0178be74059f49d8878b5c05f2d7ed8ce.tar.gz | |
another correction of the bash wrapper scripts
| -rw-r--r-- | doc/ranger.1 | 5 | ||||
| -rw-r--r-- | doc/ranger.pod | 3 | ||||
| -rwxr-xr-x | ranger.py | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1 index 2ad3d9c0..897a2969 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -711,11 +711,12 @@ This is a bash function (for \fI~/.bashrc\fR) to change the directory to the las visited one after ranger quits. You can always type \f(CW\*(C`cd \-\*(C'\fR to go back to the original one. .PP -.Vb 8 +.Vb 9 \& function ranger\-cd { \& tempfile=\*(Aq/tmp/chosendir\*(Aq \& /usr/bin/ranger \-\-choosedir="$tempfile" "${@:\-$(pwd)}" -\& if [ \-f "$tempfile" \-a "$(cat \-\- "$tempfile")" != "$(echo \-n \`pwd\`)" ]; then +\& test \-f "$tempfile" && +\& if [ "$(cat \-\- "$tempfile")" != "$(echo \-n \`pwd\`)" ]; then \& cd \-\- "$(cat "$tempfile")" \& rm \-f \-\- "$tempfile" \& fi diff --git a/doc/ranger.pod b/doc/ranger.pod index ddd8dada..e5cd8987 100644 --- a/doc/ranger.pod +++ b/doc/ranger.pod @@ -785,7 +785,8 @@ original one. function ranger-cd { tempfile='/tmp/chosendir' /usr/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}" - if [ -f "$tempfile" -a "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then + test -f "$tempfile" && + if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then cd -- "$(cat "$tempfile")" rm -f -- "$tempfile" fi diff --git a/ranger.py b/ranger.py index 0991b451..1508b5de 100755 --- a/ranger.py +++ b/ranger.py @@ -23,7 +23,8 @@ if [ ! -z "$1" ]; then ranger="$1" shift "$ranger" --choosedir="$tempfile" "${@:-$(pwd)}" - if [ -f "$tempfile" -a "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then + test -f "$tempfile" && + if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then cd "$(cat "$tempfile")" rm -f -- "$tempfile" fi && return 0 |