FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

42_npmjs: fix shell compatibility

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18568 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-02-12 12:25:24 +00:00
parent 7acc194250
commit 7976ad22b4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/42_npmjs.pm
View File

@ -372,8 +372,7 @@ sub Set($$@) {
if ( !defined( $hash->{".fhem"}{npm}{nodejsversions} ) ) {
$list =
"install:nodejs-v11,nodejs-v10,nodejs-v8,nodejs-v6,statusRequest"
unless ( exists( $hash->{".fhem"}{subprocess} ) );
"install:nodejs-v11,nodejs-v10,nodejs-v8,nodejs-v6,statusRequest";
}
else {
$list = "outdated:noArg";
@ -718,9 +717,9 @@ sub ExecuteNpmCommand($) {
. '\"versions\": "; '
. 'node -e "console.log(JSON.stringify(process.versions));"; '
. 'L1=$(npm list --json --silent --depth=0 2>/dev/null); '
. '[[ "$L1" != "" && "$L1" != "\n" ]] && echo ", \"listed\": $L1"; '
. '[ "$L1" != "" ] && [ "$L1" != "\n" ] && echo ", \"listed\": $L1"; '
. 'L2=$(npm outdated --json 2>&1); '
. '[[ "$L2" != "" && "$L2" != "\n" ]] && echo ", \"outdated\": $L2"; '
. '[ "$L2" != "" ] && [ "$L2" != "\n" ] && echo ", \"outdated\": $L2"; '
. 'echo "}"'
. $cmdSuffix;
}
@ -744,9 +743,9 @@ sub ExecuteNpmCommand($) {
. '\"versions\": "; '
. 'node -e "console.log(JSON.stringify(process.versions));"; '
. 'L1=$(npm list -g --json --silent --depth=0 2>/dev/null); '
. '[[ "$L1" != "" && "$L1" != "\n" ]] && echo ", \"listed\": $L1"; '
. '[ "$L1" != "" ] && [ "$L1" != "\n" ] && echo ", \"listed\": $L1"; '
. 'L2=$(npm outdated -g --json 2>&1); '
. '[[ "$L2" != "" && "$L2" != "\n" ]] && echo ", \"outdated\": $L2"; '
. '[ "$L2" != "" ] && [ "$L2" != "\n" ] && echo ", \"outdated\": $L2"; '
. 'echo "}"'
. $cmdSuffix;
}
@ -1067,6 +1066,8 @@ sub WriteReadings($$) {
: 'check failed'
)
);
delete $hash->{".fhem"}{npm}{nodejsversions}
unless ( $decode_json->{versions} );
$hash->{helper}{lastSync} = ToDay();
}