From ce08bb2ad2d6b6d283f62d0c5bc35bb4bacb3b81 Mon Sep 17 00:00:00 2001
From: David Frascone <codemonkey@BananaTree.local>
Date: Fri, 5 Nov 2010 09:26:26 -0600
Subject: [PATCH] The grep on the commands would sometimes output errors,
 causing noise and breaking scripts.

---
 share/functions/psub.fish  | 2 +-
 share/functions/trap.fish  | 2 +-
 share/functions/type.fish  | 2 +-
 share/functions/umask.fish | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/functions/psub.fish b/share/functions/psub.fish
index 9eebd13bb..b3e958d47 100644
--- a/share/functions/psub.fish
+++ b/share/functions/psub.fish
@@ -12,7 +12,7 @@ function psub --description "Read from stdin into a file and output the filename
 		set longopt 
 	end
 
-	if not getopt -n psub -Q $shortopt $longopt -- $argv
+	if not getopt -n psub -Q $shortopt $longopt -- $argv >/dev/null
 		return 1
 	end
 
diff --git a/share/functions/trap.fish b/share/functions/trap.fish
index ee29aa784..4a08af9d1 100644
--- a/share/functions/trap.fish
+++ b/share/functions/trap.fish
@@ -34,7 +34,7 @@ function trap -d 'Perform an action when the shell recives a signal'
 		set longopt -l print,help,list-signals
 	end
 
-	if not getopt -n type -Q $shortopt $longopt -- $argv
+	if not getopt -n type -Q $shortopt $longopt -- $argv >/dev/null
 		return 1
 	end
 
diff --git a/share/functions/type.fish b/share/functions/type.fish
index a9b1bdffd..f57c7fa8f 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -15,7 +15,7 @@ function type --description "Print the type of a command"
 		set longopt -l type,path,force-path,all,no-functions,help
 	end
 
-	if not getopt -n type -Q $shortopt $longopt -- $argv
+	if not getopt -n type -Q $shortopt $longopt -- $argv >/dev/null
 		return 1
 	end
 
diff --git a/share/functions/umask.fish b/share/functions/umask.fish
index 319ce9ac3..4ddb5dd6e 100644
--- a/share/functions/umask.fish
+++ b/share/functions/umask.fish
@@ -145,7 +145,7 @@ function umask --description "Set default file permission mask"
 		set longopt -l as-command,symbolic,help
 	end
 
-	if not getopt -n umask -Q $shortopt $longopt -- $argv
+	if not getopt -n umask -Q $shortopt $longopt -- $argv >/dev/null
 		return 1
 	end