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

updatefhem will be silently converted to update

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3000 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-03-30 12:41:09 +00:00
parent f141cf75a8
commit e7d8343dc7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,6 +1,7 @@
# Add changes at the top of the list. # Add changes at the top of the list.
- SVN - SVN
- feature: updatefhem will be silently converted to update
- feature: FHEMWEB: save button replaced with the menu entry "Save config" - feature: FHEMWEB: save button replaced with the menu entry "Save config"
- feature: notify supports $NAME/$EVENT/$EVTPART0/etc. @/% is deprecated. - feature: notify supports $NAME/$EVENT/$EVTPART0/etc. @/% is deprecated.
- feature: 93_DbLog extended to give more functions for the charting frontend. - feature: 93_DbLog extended to give more functions for the charting frontend.

8
fhem/fhem.pl
View File

@ -269,6 +269,9 @@ $readingFnAttributes = "event-on-change-reading event-on-update-reading ".
Hlp=>"<sec>,sleep for sec, 3 decimal places" }, Hlp=>"<sec>,sleep for sec, 3 decimal places" },
"trigger" => { Fn=>"CommandTrigger", "trigger" => { Fn=>"CommandTrigger",
Hlp=>"<devspec> <state>,trigger notify command" }, Hlp=>"<devspec> <state>,trigger notify command" },
"update" => {
Hlp => "[development|stable] [<file>|check|fhem],update Fhem" },
"updatefhem" => { ReplacedBy => "update" },
); );
################################################### ###################################################
@ -756,9 +759,11 @@ AnalyzeCommand($$)
} }
} }
$fn = $cmds{$fn}{ReplacedBy} if(defined($cmds{$fn}{ReplacedBy}));
############# #############
# autoload commands. # autoload commands.
if(!defined($cmds{$fn})) { if(!defined($cmds{$fn}) || !defined($cmds{$fn}{Fn})) {
map { $fn = $_ if(lc($fn) eq lc($_)); } keys %modules; map { $fn = $_ if(lc($fn) eq lc($_)); } keys %modules;
$fn = LoadModule($fn); $fn = LoadModule($fn);
return "Unknown command $fn, try help" if(!defined($cmds{$fn})); return "Unknown command $fn, try help" if(!defined($cmds{$fn}));
@ -848,6 +853,7 @@ CommandHelp($$)
"-----------------------------------------------\n"; "-----------------------------------------------\n";
for my $cmd (sort keys %cmds) { for my $cmd (sort keys %cmds) {
next if(!$cmds{$cmd}{Hlp});
my @a = split(",", $cmds{$cmd}{Hlp}, 2); my @a = split(",", $cmds{$cmd}{Hlp}, 2);
$str .= sprintf("%-9s %-25s %s\n", $cmd, $a[0], $a[1]); $str .= sprintf("%-9s %-25s %s\n", $cmd, $a[0], $a[1]);