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

42_npmjs: separate statusRequest setter from install setter

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18689 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-02-22 14:17:05 +00:00
parent 37a9c7c9c3
commit 4a71c783bd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/42_npmjs.pm
View File

@ -268,6 +268,9 @@ sub Set($$@) {
if ( $cmd eq 'outdated' ) {
$hash->{".fhem"}{npm}{cmd} = $cmd;
}
elsif ( lc($cmd) eq 'statusrequest' ) {
$hash->{".fhem"}{npm}{cmd} = 'getNodeVersion';
}
elsif ( $cmd eq 'update' ) {
if ( defined( $args[0] ) and ( lc( $args[0] ) eq "fhem-all" ) ) {
return "Please run outdated check first"
@ -363,7 +366,7 @@ sub Set($$@) {
if ( !defined( $hash->{".fhem"}{npm}{nodejsversions} ) ) {
$list =
"install:nodejs-v11,nodejs-v10,nodejs-v8,nodejs-v6,statusRequest";
"install:nodejs-v11,nodejs-v10,nodejs-v8,nodejs-v6 statusRequest:noArg";
}
else {
$list = "outdated:noArg";
@ -811,14 +814,13 @@ sub ExecuteNpmCommand($) {
if ( not defined( $cmd->{nodejsversions} )
or not defined( $cmd->{nodejsversions}{node} ) )
{
if ( lc($1) eq "statusrequest" ) {
$npm->{npminstall} = $npm->{nodejsversions};
}
elsif ( $1 =~ /^nodejs-v(\d+)/ ) {
if ( $1 =~ /^nodejs-v(\d+)/ ) {
$npm->{npminstall} =
$cmdPrefix
. 'echo n | if [ -z "$(node --version 2>/dev/null)" ]; then'
. ' sh -c "curl -sSL https://deb.nodesource.com/setup_'.$1.'.x | DEBIAN_FRONTEND=noninteractive sudo -n -E bash - >/dev/null 2>&1" 2>&1 &&'
. ' sh -c "curl -sSL https://deb.nodesource.com/setup_'
. $1
. '.x | DEBIAN_FRONTEND=noninteractive sudo -n -E bash - >/dev/null 2>&1" 2>&1 &&'
. ' sh -c "DEBIAN_FRONTEND=noninteractive sudo -n -E apt-get install -qqy nodejs >/dev/null 2>&1" 2>&1; '
. 'fi; '
. 'node -e "console.log(JSON.stringify(process.versions));" 2>&1'
@ -1488,6 +1490,8 @@ sub ToDay() {
<br>
<a name="npmjsset" id="npmjsset"></a><b>Set</b>
<ul>
<li>statusRequest - Update Node.js installation status
</li>
<li>outdated - fetch information about update state
</li>
<li>update - trigger complete or selected update process. this will take a moment