From daf62af720e66f8059982bf3638d37534aba54aa Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 13 Oct 2014 17:43:25 +1300
Subject: Remove some overzealous command checks

---
 bash/bashrc.d/gnupg.bash | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'bash/bashrc.d/gnupg.bash')

diff --git a/bash/bashrc.d/gnupg.bash b/bash/bashrc.d/gnupg.bash
index e5962d21..44697f58 100644
--- a/bash/bashrc.d/gnupg.bash
+++ b/bash/bashrc.d/gnupg.bash
@@ -1,8 +1,3 @@
-# Bail if no gpg(1)
-if ! hash gpg 2>/dev/null ; then
-    return
-fi
-
 # Wrapper around gpg(1) to stop ``--batch'' breaking things
 gpg() {
     case $* in
@@ -19,6 +14,12 @@ gpg() {
 _gpg() {
     local word=${COMP_WORDS[COMP_CWORD]}
 
+    # Bail if no gpg(1)
+    if ! hash gpg 2>/dev/null ; then
+        COMPREPLY=()
+        return 1
+    fi
+
     # Bail if word doesn't start with two dashes
     if [[ $word != --* ]] ; then
         COMPREPLY=()
-- 
cgit v1.2.3