FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

98_Installer: coloring

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18885 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-03-12 22:24:38 +00:00
parent 15ac6dca91
commit 730196eeda
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/98_Installer.pm
View File

@ -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/'

12
fhem/FHEM/Meta.pm
View File

@ -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);