FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-28 02:44:53 +00:00
Code Issues Releases Wiki Activity

98_Install: more robust SubProcess handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19288 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-04-29 13:38:10 +00:00
parent 4e67e97ca6
commit 5886f6b5e7
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fhem/FHEM/98_Installer.pm
View File

@ -815,7 +815,23 @@ sub PollChild($) {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if ( !exists( $hash->{".fhem"}{subprocess} )
|| !ref( $hash->{".fhem"}{subprocess} )
|| ref( $hash->{".fhem"}{subprocess} ) ne 'SubProcess' )
{
my $emsg =
defined( $hash->{".fhem"}{subprocess} )
&& $hash->{".fhem"}{subprocess}{lasterror} ne ''
? '{"error":"' . $hash->{".fhem"}{subprocess}{lasterror} . '"}'
: '{"error":"Child process suddenly ended"}';
Log3 $name, 5, "Installer ($name) - $emsg";
CleanSubprocess($hash);
PreProcessing( $hash, $emsg );
return;
}
my $subprocess = $hash->{".fhem"}{subprocess}; my $subprocess = $hash->{".fhem"}{subprocess};
my $json = $subprocess->readFromChild(); my $json = $subprocess->readFromChild();
@ -897,7 +913,7 @@ sub ExecuteFhemCommand($) {
{ {
if ( $1 =~ /App::cpanminus/i ) { if ( $1 =~ /App::cpanminus/i ) {
$installer->{installperl} = $installer->{installperl} =
'sh -c "curl -fsSL https://git.io/cpanm | ' 'sh -c "( curl -fsSL https://git.io/cpanm 2>/dev/null || wget -qO- https://git.io/cpanm 2>/dev/null ) | '
. $sudoH . $sudoH
. '$(which perl) - App::cpanminus >/dev/null 2>&1" 2>&1 ' . '$(which perl) - App::cpanminus >/dev/null 2>&1" 2>&1 '
. '&& TEST=$(which cpanm) || echo "sh: command not found: cpanm"; which cpanm >/dev/null 2>&1 && sh -c "' . '&& TEST=$(which cpanm) || echo "sh: command not found: cpanm"; which cpanm >/dev/null 2>&1 && sh -c "'
@ -2380,19 +2396,19 @@ sub CreatePrereqsList {
push @ret, $tBClose; push @ret, $tBClose;
my $descr = my $descr =
'These dependencies ' 'Required dependencies '
. $strongOpen . 'must' . $strongOpen . 'must'
. $strongClose . $strongClose
. ' be installed for the listed FHEM modules to work.'; . ' be installed for the listed FHEM modules to work.';
$descr = $descr =
'These dependencies are ' 'Recommended dependencies are '
. $strongOpen . $strongOpen
. 'strongly encouraged' . 'strongly encouraged'
. $strongClose . $strongClose
. ' and should be installed for full functionality of the listed FHEM modules, except in resource constrained environments.' . ' and should be installed for full functionality of the listed FHEM modules, except in resource constrained environments.'
if ( $importance eq 'Recommended' ); if ( $importance eq 'Recommended' );
$descr = $descr =
'These dependencies are ' 'Suggested dependencies are '
. $strongOpen . $strongOpen
. 'optional' . 'optional'
. $strongClose . $strongClose
@ -5102,7 +5118,13 @@ sub LoadInstallStatusPerl(;$) {
{ {
my $reqV = $modPreqs->{$mAttr}{$pkg}; my $reqV = $modPreqs->{$mAttr}{$pkg};
my $instV = $pkgStatus{Perl}{installed}{$pkg}; my $instV = $pkgStatus{Perl}{installed}{$pkg};
if ( $reqV ne '0' && $instV ne '0' ) { if ( defined($reqV)
&& $reqV ne ''
&& $reqV ne '0'
&& defined($instV)
&& $instV ne ''
&& $instV ne '0' )
{
$reqV = version->parse($reqV)->numify; $reqV = version->parse($reqV)->numify;
$instV = version->parse($instV)->numify; $instV = version->parse($instV)->numify;
@ -5381,7 +5403,7 @@ sub __GetExtendedEnvPath {
foreach my $p ( reverse @binpath ) { foreach my $p ( reverse @binpath ) {
next unless ( $p && $p ne '' ); next unless ( $p && $p ne '' );
$p =~ s/\\/\\\\/g if ($^O =~ m/Win/); $p =~ s/\\/\\\\/g if ( $^O =~ m/Win/ );
unshift @path, $p unless ( grep ( /^$p$/, @path ) ); unshift @path, $p unless ( grep ( /^$p$/, @path ) );
} }
@ -5508,7 +5530,7 @@ sub __list_module {
"abstract": "Modul zum Update von FHEM, zur Installation von Drittanbieter FHEM Modulen und der Verwaltung von Systemvoraussetzungen" "abstract": "Modul zum Update von FHEM, zur Installation von Drittanbieter FHEM Modulen und der Verwaltung von Systemvoraussetzungen"
} }
}, },
"version": "v0.5.3", "version": "v0.5.5",
"release_status": "testing", "release_status": "testing",
"author": [ "author": [
"Julian Pawlowski <julian.pawlowski@gmail.com>" "Julian Pawlowski <julian.pawlowski@gmail.com>"