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

update.pm: handle non-standard fhem.pl location (Forum 27451)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6736 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-10-10 07:56:17 +00:00
parent 8245d3b1f2
commit be1b528df9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/98_update.pm
View File

@ -19,6 +19,7 @@ my $updateInBackground;
my $updRet; my $updRet;
my %updDirs; my %updDirs;
my $updArg; my $updArg;
my $mainPgm = "/fhem.pl\$";
######################################## ########################################
@ -331,8 +332,10 @@ upd_writeFile($$$$)
my $rest = ($restoreDir ? "trying to restore the previous version and ":""). my $rest = ($restoreDir ? "trying to restore the previous version and ":"").
"aborting the update"; "aborting the update";
if(!open(FD, ">$root/$fName")) { my $fPath = "$root/$fName";
uLog 1, "open $root/$fName failed: $!, $rest"; $fPath = $0 if($fPath =~ m/$mainPgm/);
if(!open(FD, ">$fPath")) {
uLog 1, "open $fPath failed: $!, $rest";
mv "$root/$restoreDir/$fName", "$root/$fName" if($restoreDir); mv "$root/$restoreDir/$fName", "$root/$fName" if($restoreDir);
return 0; return 0;
} }
@ -340,14 +343,14 @@ upd_writeFile($$$$)
print FD $content; print FD $content;
close(FD); close(FD);
my $written = -s "$root/$fName"; my $written = -s "$fPath";
if($written != length($content)) { if($written != length($content)) {
uLog 1, "writing $root/$fName failed: $!, $rest"; uLog 1, "writing $fPath failed: $!, $rest";
mv "$root/$restoreDir/$fName", "$root/$fName" if($restoreDir); mv "$root/$restoreDir/$fName", "$fPath" if($restoreDir);
return; return;
} }
cfgDB_FileUpdate("$root/$fName") if(configDBUsed()); cfgDB_FileUpdate("$fPath") if(configDBUsed());
return 1; return 1;
} }