From 683dd53140d20d7961873d82dfb77ec4224aaaec Mon Sep 17 00:00:00 2001
From: Jorge Bucaran <mail@jorgebucaran.com>
Date: Sat, 26 Mar 2016 15:36:21 +0900
Subject: [PATCH] Remove script file support for .load plugins. Revert 2cfa1c.

---
 functions/__fisher_plugin_walk.fish      |  6 ------
 test/fixtures/path-walk/foobar-path-walk | 14 +++++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/functions/__fisher_plugin_walk.fish b/functions/__fisher_plugin_walk.fish
index d515004..5710209 100644
--- a/functions/__fisher_plugin_walk.fish
+++ b/functions/__fisher_plugin_walk.fish
@@ -39,12 +39,6 @@ function __fisher_plugin_walk -a plugin path
 
     for file in $path/{functions/,}*.{py,rb,php,pl,awk,sed}
         set -l prefix functions
-        set -l load_files (find $path -depth 1 -type f -name "*.load" ^ /dev/null)
-
-        if test ! -z "$load_files"
-            set prefix conf.d
-        end
-
         set -l target $prefix/(basename $file)
 
         debug "Script %s" $target
diff --git a/test/fixtures/path-walk/foobar-path-walk b/test/fixtures/path-walk/foobar-path-walk
index 051257c..b99a9f0 100644
--- a/test/fixtures/path-walk/foobar-path-walk
+++ b/test/fixtures/path-walk/foobar-path-walk
@@ -14,13 +14,13 @@
 --source conf.d/foobar.mod.fish
 --source conf.d/foobar.load.fish
 --source completions/foobar.fish
--- conf.d/foobar.py
--- conf.d/foobar.rb
--- conf.d/foobar.php
--- conf.d/foobar.pl
--- conf.d/foobar.awk
--- conf.d/quux.awk
--- conf.d/foobar.sed
+-- functions/foobar.py
+-- functions/foobar.rb
+-- functions/foobar.php
+-- functions/foobar.pl
+-- functions/foobar.awk
+-- functions/quux.awk
+-- functions/foobar.sed
 --man man/man1/foobar.1
 --man man/man2/foobar.2
 --man man/man3/foobar.3