Merge branch 'master' into deprecate-refresh

b490fad3 · Justin Hileman · 37705618 · e04ba4f3 · 37705618 · b490fad3
Commit b490fad3 authored Mar 23, 2016 by Justin Hileman
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

lib/available.fish lib/available.fish +0 -9

pkg/omf/functions/compat/available.fish pkg/omf/functions/compat/available.fish +10 -0

No files found.
--- a/lib/available.fish
+++ b/lib/available.fish
-# SYNOPSIS
-#   available [name]
-#
-# OVERVIEW
-#   Check if a function or program is available.
-
-function available -a name -d "Check if a function or program is available."
-  type "$name" ^/dev/null >&2
-end
--- a/pkg/omf/functions/compat/available.fish
+++ b/pkg/omf/functions/compat/available.fish
+function available
+  echo (status -t)[5] | read -la caller
+  printf 'warning: function %savailable%s is deprecated and will be removed soon.\n' \
+  (set_color -u) (set_color normal)
+
+  contains input $caller
+    or echo $caller
+
+  type -q $argv
+end