diff options
| author | Jesse Byler <jbyler@coverity.com> | 2015-06-10 16:20:09 -0700 |
|---|---|---|
| committer | Jesse Byler <jbyler@coverity.com> | 2015-06-10 16:20:09 -0700 |
| commit | 864e372ce78c6e2c027bf525ea9eae1dfd0ddb0a (patch) | |
| tree | ef692032bceb190aac988b3f94fbe93e333ad668 | |
| parent | 1a5c0cb9a5409a6214797273b5398ef0e849cd63 (diff) | |
| download | ranger-864e372ce78c6e2c027bf525ea9eae1dfd0ddb0a.tar.gz | |
Fix mktemp invocation to work on Mac OS X and Linux
mktemp on Mac OS X (and probably all BSDs) just returns an error when invoked without any arguments. The -t option used in this change is interpreted differently on Mac OS X and Linux, and is deprecated on Linux, but this invocation works as expected on both. See discussion at https://unix.stackexchange.com/questions/30091 Another alternative would be to use Python's tempfile module: https://docs.python.org/2/library/tempfile.html
| -rw-r--r-- | examples/bash_automatic_cd.sh | 2 | ||||
| -rwxr-xr-x | ranger.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/bash_automatic_cd.sh b/examples/bash_automatic_cd.sh index ac96ea12..040bf21a 100644 --- a/examples/bash_automatic_cd.sh +++ b/examples/bash_automatic_cd.sh @@ -8,7 +8,7 @@ # original directory. function ranger-cd { - tempfile="$(mktemp)" + tempfile="$(mktemp -t tmp.XXXXXX)" /usr/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}" test -f "$tempfile" && if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then diff --git a/ranger.py b/ranger.py index 1d7e42e1..864acf27 100755 --- a/ranger.py +++ b/ranger.py @@ -9,7 +9,7 @@ # default is simply "ranger". (Not this file itself!) # The other arguments are passed to ranger. """": -tempfile="$(mktemp)" +tempfile="$(mktemp -t tmp.XXXXXX)" ranger="${1:-ranger}" test -z "$1" || shift "$ranger" --choosedir="$tempfile" "${@:-$(pwd)}" |