From 730196eedacff07e48e0fbd502f33e4d46d959f8 Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Tue, 12 Mar 2019 22:24:38 +0000
Subject: [PATCH] 98_Installer: coloring

git-svn-id: https://svn.fhem.de/fhem/trunk@18885 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_Installer.pm |  3 +++
 fhem/FHEM/Meta.pm         | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/fhem/FHEM/98_Installer.pm b/fhem/FHEM/98_Installer.pm
index 41a363152..13547357a 100644
--- a/fhem/FHEM/98_Installer.pm
+++ b/fhem/FHEM/98_Installer.pm
@@ -1773,6 +1773,9 @@ m/^([^<>\n\r]+?)(?:\s+(\(last release only\)))?(?:\s+(?:<(.*)>))?$/
                       ? "$installed (FHEM included)"
                       : 'included';
                 }
+                elsif ( $installed eq 'installed' ) {
+                    $installed = $colorGreen . $installed . $colorClose;
+                }
 
                 $prereq =
                     '<a href="https://metacpan.org/pod/'
diff --git a/fhem/FHEM/Meta.pm b/fhem/FHEM/Meta.pm
index c5539e0d8..44435c242 100644
--- a/fhem/FHEM/Meta.pm
+++ b/fhem/FHEM/Meta.pm
@@ -1012,11 +1012,11 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
 
     #TODO
     # - check VCS data against update data
-    # - get dependencies via Perl module
-    # - add info from MAINTAINER.txt
+    # - get dependencies for modules loaded by FHEM modules
 
     # use VCS info 'as is', but only when:
     #   - file name matches
+    #   - file has maintainer in MAINTAINER.txt
     if ( @vcs && $vcs[1] eq $modMeta->{x_file}[2] ) {
         push @vcs,
           fhemTimeGm(
@@ -1169,9 +1169,11 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
             # last update was not by one of the named authors
             if ( defined( $modMeta->{x_vcs} ) ) {
                 my $lastEditor = $modMeta->{x_vcs}[15];
-                push @{ $modMeta->{x_fhem_maintainer} }, $modMeta->{x_vcs}[15]
+                push @{ $modMeta->{x_fhem_maintainer} },
+                  $modMeta->{x_vcs}[15]
                   unless (
-                    grep( m/^$lastEditor$/i, @{ $modMeta->{x_fhem_maintainer} } )
+                    grep( m/^$lastEditor$/i,
+                        @{ $modMeta->{x_fhem_maintainer} } )
                   );
             }
         }
@@ -1260,7 +1262,7 @@ sub __GetMaintainerdata {
                 $_           # return the modified string
             } split( "[ \t][ \t]*", $l, 3 );
 
-            if ( $line[0] =~ m/^((.+\/)?((?:(\d+)_)?(.+)\.(.+)))$/ ) {
+            if ( $line[0] =~ m/^((.+\/)?((?:(\d+)_)?(.+?)(?:\.(.+))?))$/ ) {
 
                 # Ignore all files that are not a main module for now
                 next unless ($4);