Fix defaulting

agrism · Nov 3, 2022 · 78a5422 · 78a5422
1 parent 6eb5c03
commit 78a5422
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/mcfly.bash b/mcfly.bash
@@ -35,7 +35,7 @@ if [[ -t 0 ]] && [[ "$__MCFLY_LOADED" != "loaded" ]]; then
 
  # Populate McFly's temporary, per-session history file from recent commands in the shell's primary HISTFILE.
  if [[ ! -f "${MCFLY_HISTORY}" ]]; then
- MCFLY_HISTORY=$(mktemp ${TMPDIR:/tmp}/mcfly.XXXXXXXX)
+ MCFLY_HISTORY=$(mktemp ${TMPDIR:-/tmp}/mcfly.XXXXXXXX)
  export MCFLY_HISTORY
  command tail -n100 "${HISTFILE}" >| "${MCFLY_HISTORY}"
  fi

diff --git a/mcfly.fish b/mcfly.fish
@@ -43,7 +43,11 @@ if test "$__MCFLY_LOADED" != "loaded"
  # If this is an interactive shell, set up key binding functions.
  if status is-interactive
  function __mcfly-history-widget -d "Search command history with McFly"
- set -l mcfly_output (mktemp ${TMPDIR:/tmp}/mcfly.output.XXXXXXXX)
+ set tmpdir $TMPDIR
+ if test -z "$tmpdir"
+ set tmpdir /tmp
+ end
+ set -l mcfly_output (mktemp "$tmpdir/mcfly.output.XXXXXXXX")
  eval $__MCFLY_CMD search -o '$mcfly_output' -- (commandline | string escape)
 
  # Interpret commandline/run requests from McFly

diff --git a/mcfly.zsh b/mcfly.zsh
@@ -27,7 +27,7 @@ if [[ -o interactive ]] && [[ "$__MCFLY_LOADED" != "loaded" ]]; then
 
  # McFly's temporary, per-session history file.
  if [[ ! -f "${MCFLY_HISTORY}" ]]; then
- export MCFLY_HISTORY=$(command mktemp ${TMPDIR:/tmp}/mcfly.XXXXXXXX)
+ export MCFLY_HISTORY=$(command mktemp ${TMPDIR:-/tmp}/mcfly.XXXXXXXX)
  fi
 
  # Check if we need to use extended history
@@ -43,7 +43,7 @@ if [[ -o interactive ]] && [[ "$__MCFLY_LOADED" != "loaded" ]]; then
 
  # Populate McFly's temporary, per-session history file from recent commands in the shell's primary HISTFILE.
  if [[ ! -f "${MCFLY_HISTORY}" ]]; then
- export MCFLY_HISTORY=$(command mktemp ${TMPDIR:/tmp}/mcfly.XXXXXXXX)
+ export MCFLY_HISTORY=$(command mktemp ${TMPDIR:-/tmp}/mcfly.XXXXXXXX)
  command tail -n100 "${HISTFILE}" >| ${MCFLY_HISTORY}
  fi
 
@@ -70,7 +70,7 @@ if [[ -o interactive ]] && [[ "$__MCFLY_LOADED" != "loaded" ]]; then
  () {
  echoti rmkx
  exec </dev/tty
- local mcfly_output=$(mktemp ${TMPDIR:/tmp}/mcfly.output.XXXXXXXX)
+ local mcfly_output=$(mktemp ${TMPDIR:-/tmp}/mcfly.output.XXXXXXXX)
  $MCFLY_PATH --history_format $MCFLY_HISTORY_FORMAT search -o "${mcfly_output}" "${LBUFFER}"
  echoti smkx