Make trap sort of work on OS X

https://github.com/fish-shell/fish-shell/issues/607

1 files changed, 21 insertions, 10 deletions

diff --git a/share/functions/trap.fish b/share/functions/trap.fish
index 5432df1a..640567f3 100644
--- a/share/functions/trap.fish
+++ b/share/functions/trap.fish
@@ -25,21 +25,32 @@ function trap -d 'Perform an action when the shell receives a signal'
 	set -l mode
 	set -l cmd
 	set -l sig
-	set -l shortopt
-	set -l longopt
 
-	set -l shortopt -o lph
+	set -l options
 	set -l longopt
-	if not getopt -T >/dev/null
-		set longopt -l print,help,list-signals
-	end
-
-	if not getopt -n type -Q $shortopt $longopt -- $argv >/dev/null
-		return 1
+	set -l shortopt lph
+	if not getopt -T > /dev/null
+		# GNU getopt
+		set longopt print,help,list-signals
+		set options -o $shortopt -l $longopt --
+		# Verify options
+		if not getopt -n type $options $argv >/dev/null
+			return 1
+		end
+	else
+		# Old getopt, used on OS X
+		set options $shortopt
+		# Verify options
+		if not getopt $options $argv >/dev/null
+			return 1
+		end
 	end
 
-	set -l tmp (getopt $shortopt $longopt -- $argv)
+	# Do the real getopt invocation
+	set -l tmp (getopt $options $argv)
 
+	# Break tmp up into an array
+	set -l opt
 	eval set opt $tmp
 
 	while count $opt >/dev/null