From 633e52101b1b78af0f61f212881ec18658a99d91 Mon Sep 17 00:00:00 2001
From: Sheldon Els <sels@blizzard.com>
Date: Sun, 30 Aug 2015 18:22:39 +0200
Subject: [PATCH] describe works on installed packages

also modified list_db_packages to return all packages by default, but with a
skip_installed to skip listing installed packages
---
 pkg/omf/cli/omf.list_db_packages.fish | 9 +++++++--
 pkg/omf/completions/omf.fish          | 2 +-
 pkg/omf/omf.fish                      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/omf/cli/omf.list_db_packages.fish b/pkg/omf/cli/omf.list_db_packages.fish
index a1559e4..e17a225 100644
--- a/pkg/omf/cli/omf.list_db_packages.fish
+++ b/pkg/omf/cli/omf.list_db_packages.fish
@@ -1,6 +1,11 @@
 # List all packages available to install from the registry.
-function omf.list_db_packages
+function omf.list_db_packages -a skip_installed
   for item in (basename $OMF_PATH/db/pkg/*)
-    contains $item (basename {$OMF_PATH,$OMF_CONFIG}/pkg/*); or echo $item
+    if  begin
+          test -z $skip_installed
+          or not contains $item (basename {$OMF_PATH,$OMF_CONFIG}/pkg/*)
+        end
+      echo $item
+    end
   end
 end
diff --git a/pkg/omf/completions/omf.fish b/pkg/omf/completions/omf.fish
index a4d2e61..3660cfc 100644
--- a/pkg/omf/completions/omf.fish
+++ b/pkg/omf/completions/omf.fish
@@ -16,7 +16,7 @@ complete -c omf -n "__omf.opt_is q query"         -a (printf "%s " (set | awk '{
 complete -c omf -n "__omf.opt_is r rm remove"     -a (printf "%s " (omf.list_local_packages) (omf.list_installed_themes))
 complete -c omf -n "__omf.opt_is d desc describe" -a (printf "%s " (omf.list_db_packages))
 complete -c omf -n "__omf.opt_is c cd"            -a (printf "%s " (omf.list_db_packages))
-complete -c omf -n "__omf.opt_is i install"       -a (printf "%s " (omf.list_db_packages))
+complete -c omf -n "__omf.opt_is i install"       -a (printf "%s " (omf.list_db_packages "skip installed packages"))
 complete -c omf -n "__omf.opt_is t theme"         -a (printf "%s " (omf.list_themes))
 complete -c omf -n "__omf.opt_is help"            -a "install theme remove update list describe cd new submit query destroy"
 
diff --git a/pkg/omf/omf.fish b/pkg/omf/omf.fish
index 9f1c1b0..109fc67 100644
--- a/pkg/omf/omf.fish
+++ b/pkg/omf/omf.fish
@@ -89,7 +89,7 @@ function omf -d "Oh My Fish"
 
     case "i" "install" "get"
       if test (count $argv) -eq 1
-        omf.list_db_packages | column
+        omf.list_db_packages "skip installed packages" | column
       else
         omf.install_package $argv[2..-1]
         refresh