remove trailing slash after dir match and stop looking for ./ls++.conf

trapd00r · Jan 10, 2019 · b5122e0 · b5122e0
1 parent 3825a51
commit b5122e0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ls++ b/ls++
@@ -2,7 +2,7 @@
 # vim:ft=perl:et:
 my $APP = 'ls++';
 use vars qw($VERSION);
-$VERSION = '0.40';
+$VERSION = '0.42';
 
 use strict;
 use Term::ExtendedColor qw(fg uncolor);
@@ -290,10 +290,10 @@ sub add_ls_color {
     -d $no_ls_color_file and $no_ls_color_file .= '/';
 
     if($no_ls_color_file =~ m{$pattern}) {
+      $file = $no_ls_color_file;
       if($ls_colors{$pattern} eq 'IGNORE') {
         return undef;
       }
-      $file = $no_ls_color_file;
 
 #      # add attributes
 #      # 'README$' => 'bold italic 220 underline',
@@ -302,6 +302,8 @@ sub add_ls_color {
       }
     }
   }
+  # remove the trailing slash again
+  $file =~ s{/}{}g;
   return $file;
 }
 
@@ -604,7 +606,7 @@ sub _init_config {
   }
 
   my @locations = (
-    "./ls++.conf",
+#    "./ls++.conf",
     "$ENV{XDG_CONFIG_HOME}/ls++/ls++.conf",
     "$ENV{HOME}/.config/ls++/ls++.conf",
     "$ENV{HOME}/.ls++.conf",