From 5c140e55708b1c52345e4ee18bb84cf2d9089ecd Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Tue, 30 May 2017 21:06:16 -0700 Subject: [PATCH] Revert "Use open instead of osascript in help" This reverts commit f234637e53deea68303f35c342faa8518e058bec. --- share/functions/help.fish | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/share/functions/help.fish b/share/functions/help.fish index 2b5d33082..034564cbb 100644 --- a/share/functions/help.fish +++ b/share/functions/help.fish @@ -62,14 +62,9 @@ function help --description 'Show help for the fish shell' set fish_browser xdg-open end - # On OS X, we use osascript < 10.12.5, and open after (see #4035) + # On OS X, we go through osascript by default if test (uname) = Darwin - set -l version (sw_vers -productVersion | string split .) 0 0 0 - if [ $version[1] -gt 10 ] - or [ $version[1] -eq 10 -a $version[2] -gt 12 ] - or [ $version[1] -eq 10 -a $version[2] -eq 12 -a $version[3] -ge 5 ] - set fish_browser open - else + if type -q osascript set fish_browser osascript end end