searchlink 2.3.61 → 2.3.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff5bedf7ccbc233a648654e9f3c7bf41981a451c11ddfb6b1fd90741ae6ae2a
-  data.tar.gz: 41e05ed7af669c38d093eb5f109489a786e5bef29575caade95c8328332abf06
+  metadata.gz: 20591719c33fd31a48e40072d839ea484f13fec80789fccee1417108e0e4f9f4
+  data.tar.gz: ff92074f65ad60d2bb52016169f9cb5d61d4ef3696130195f8ef1dfeb8b0635b
 SHA512:
-  metadata.gz: 1fcb8a00815275b8263805029d47d50d8fd5d934de2880dcfb32c41384652c5791a0c2415e5cead7b2649c348b5374f050d2a4f74b817b8399e25efd5bc72912
-  data.tar.gz: c65f32af3fdeca3ea36306b92babcaa09cfb4c1aee01c5569a1dcf8132821d9b94a05e9f186961a2e67990db6ec409b22562b12e73ef7ca4517036263a8bc642
+  metadata.gz: 06fd6071642386fed86432d1b18ccac1d7ebad0dbdcdfb8c8e5e244431d7e190039b6b53e2ce75654bef4512c28b67ba5f7d4d56c6f728bd7387bb7d74eeb5e9
+  data.tar.gz: 6d7e73ece33947326e6ff610af6c71cf8f7d113650c447bb2d97409095d780b54c3ebc5b3a6cb2da4a075e03684e02d1ff0bef1a301a8f4576576a8329b4e4db

data/lib/searchlink/config.rb

@@ -20,10 +20,11 @@ module SL
     def config_file
       old_style = File.expand_path('~/.searchlink')
       new_style = File.expand_path('~/.config/searchlink/config.yaml')
-      if File.exist?(old_style)
-        return old_style
+      if File.exist?(old_style) && !File.exist?(new_style)
+        old_style
       else
-        return new_style
+        FileUtils.mkdir_p(File.dirname(new_style))
+        new_style
       end
     end
 

data/lib/searchlink/searches.rb

@@ -115,14 +115,17 @@ module SL
 
       def load_custom
         plugins_folder = File.expand_path('~/.local/searchlink/plugins')
+        new_plugins_folder = File.expand_path('~/.config/searchlink/plugins')
 
-        Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
-          require plugin
+        if File.directory?(plugins_folder) && !File.directory?(new_plugins_folder)
+          Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
+            require plugin
+          end
         end
 
-        plugins_folder = File.expand_path('~/.config/searchlink/plugins')
+        return unless File.directory?(new_plugins_folder)
 
-        Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
+        Dir.glob(File.join(new_plugins_folder, '**/*.rb')).sort.each do |plugin|
           require plugin
         end
       end

data/lib/searchlink/version.rb

@@ -1,5 +1,5 @@
 module SL
-  VERSION = '2.3.61'
+  VERSION = '2.3.62'
 end
 
 module SL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.61
+  version: 2.3.62
 platform: ruby
 authors:
 - Brett Terpstra