Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fhemupdate.pl: fix pre 5.6 compatibility (Forum #49628)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10917 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-02-22 11:31:53 +00:00
parent 3cf8ee972e
commit ff6e0122ba
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/contrib/fhemupdate.control.fhem
View File

@ -1,3 +1,4 @@
DIR unused
MOV www/pgm2/fhemweb_multiple.js unused MOV www/pgm2/fhemweb_multiple.js unused
MOV www/pgm2/fhemweb_noArg.js unused MOV www/pgm2/fhemweb_noArg.js unused
MOV www/pgm2/fhemweb_slider.js unused MOV www/pgm2/fhemweb_slider.js unused

31
fhem/contrib/fhemupdate.pl
View File

@ -29,8 +29,7 @@ die "SVN failed, exiting\n" if($?);
################################# #################################
# new Style # new Style
chdir("$homedir/fhem"); chdir("$homedir/fhem");
my $uploaddir2 = "fhemupdate4"; system("mkdir -p fhemupdate");
system("mkdir -p $uploaddir2");
my @filelist2 = ( my @filelist2 = (
"./fhem.pl.txt", "./fhem.pl.txt",
@ -101,10 +100,22 @@ foreach my $fspec (@filelist2) {
closedir(DH); closedir(DH);
} }
chdir("$homedir/fhem/$uploaddir2"); chdir("$homedir/fhem/fhemupdate");
my %oldtime; my %oldtime;
my $fname = "controls_fhem.txt"; my $fname = "controls_fhem.txt";
if(open FH, $fname) {
while(my $l = <FH>) {
chomp($l);
next if($l !~ m/^UPD ([^ ]*) ([^ ]*) (.*)$/);
my ($ts, $fs, $file) = ($1, $2, $3);
$oldtime{"$file.txt"} = $ts if($file =~ m/\.pl$/);
$oldtime{$file} = $ts;
}
close(FH);
}
my $cfh = new IO::File ">$fname" || die "Can't open $fname: $!\n"; my $cfh = new IO::File ">$fname" || die "Can't open $fname: $!\n";
`svn info ..` =~ m/Revision: (\d+)/m; `svn info ..` =~ m/Revision: (\d+)/m;
print $cfh "REV $1\n"; print $cfh "REV $1\n";
@ -132,19 +143,23 @@ close $cfh;
$ENV{RSYNC_RSH}="ssh"; $ENV{RSYNC_RSH}="ssh";
chdir("$homedir/fhem"); chdir("$homedir/fhem");
system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate4/FHEM"); system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate/FHEM");
system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate4/FHEM/firmware"); system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate/FHEM/firmware");
system("cp -p FHEM/firmware/*.hex fhemupdate4/FHEM/firmware"); system("cp -p FHEM/firmware/*.hex fhemupdate/FHEM/firmware");
my $rsyncopts="-a --delete --compress --verbose"; my $rsyncopts="-a --delete --compress --verbose";
system("rsync $rsyncopts fhemupdate4/. fhem.de:fhem/fhemupdate4/svn"); system("rsync $rsyncopts fhemupdate/. fhem.de:fhem/fhemupdate/.");
if(-f "commandref_changed") { if(-f "commandref_changed") {
system("scp docs/commandref.html docs/commandref_DE.html fhem.de:fhem"); system("scp docs/commandref.html docs/commandref_DE.html fhem.de:fhem");
} }
system("scp CHANGED MAINTAINER.txt fhem.de:fhem"); system("scp CHANGED MAINTAINER.txt fhem.de:fhem");
system("scp fhem.de:fhem/stats/data/fhem_statistics_db.sqlite .."); system("scp fhem.de:fhem/stats/data/fhem_statistics_db.sqlite ..");
chdir("$homedir"); chdir("$homedir");
system("grep -v '^REV' fhem/fhemupdate/controls_fhem.txt > controls_fhem_5.5.txt");
system("scp controls_fhem_5.5.txt fhem.de:fhem/fhemupdate4/svn/controls_fhem.txt");
system("sh stats/dostats.sh"); system("sh stats/dostats.sh");
system("sh mksvnlog.sh > SVNLOG"); system("sh mksvnlog.sh > SVNLOG");