From ff6e0122baaf0a727cd5e6edf0f5d4e6764dcaa5 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 22 Feb 2016 11:31:53 +0000
Subject: [PATCH] fhemupdate.pl: fix pre 5.6 compatibility (Forum #49628)

git-svn-id: https://svn.fhem.de/fhem/trunk@10917 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/fhemupdate.control.fhem |  1 +
 fhem/contrib/fhemupdate.pl           | 31 +++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/fhem/contrib/fhemupdate.control.fhem b/fhem/contrib/fhemupdate.control.fhem
index 8b6a51ef3..6071ea6ea 100644
--- a/fhem/contrib/fhemupdate.control.fhem
+++ b/fhem/contrib/fhemupdate.control.fhem
@@ -1,3 +1,4 @@
+DIR unused
 MOV www/pgm2/fhemweb_multiple.js unused
 MOV www/pgm2/fhemweb_noArg.js unused
 MOV www/pgm2/fhemweb_slider.js unused
diff --git a/fhem/contrib/fhemupdate.pl b/fhem/contrib/fhemupdate.pl
index e6e5f92df..303748120 100755
--- a/fhem/contrib/fhemupdate.pl
+++ b/fhem/contrib/fhemupdate.pl
@@ -29,8 +29,7 @@ die "SVN failed, exiting\n" if($?);
 #################################
 # new Style
 chdir("$homedir/fhem");
-my $uploaddir2 = "fhemupdate4";
-system("mkdir -p $uploaddir2");
+system("mkdir -p fhemupdate");
 
 my @filelist2 = (
   "./fhem.pl.txt",
@@ -101,10 +100,22 @@ foreach my $fspec (@filelist2) {
   closedir(DH);
 }
 
-chdir("$homedir/fhem/$uploaddir2");
+chdir("$homedir/fhem/fhemupdate");
 my %oldtime;
-
 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";
 `svn info ..` =~ m/Revision: (\d+)/m;
 print $cfh "REV $1\n";
@@ -132,19 +143,23 @@ close $cfh;
 $ENV{RSYNC_RSH}="ssh";
 chdir("$homedir/fhem");
 
-system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate4/FHEM");
-system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate4/FHEM/firmware");
-system("cp -p FHEM/firmware/*.hex        fhemupdate4/FHEM/firmware");
+system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate/FHEM");
+system("cp -p ../culfw/Devices/CUL/*.hex fhemupdate/FHEM/firmware");
+system("cp -p FHEM/firmware/*.hex        fhemupdate/FHEM/firmware");
+
 
 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") {
   system("scp docs/commandref.html docs/commandref_DE.html fhem.de:fhem");
 }
 
 system("scp CHANGED MAINTAINER.txt fhem.de:fhem");
 system("scp fhem.de:fhem/stats/data/fhem_statistics_db.sqlite ..");
+
 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 mksvnlog.sh > SVNLOG");