From 934a3b57e4740da672095e0a4d753b80aed339d1 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 18 Sep 2012 14:17:03 +0000
Subject: [PATCH] Reorg - Part 7

git-svn-id: https://svn.fhem.de/fhem/trunk@1868 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/FB7270/makeimage | 36 +++++++++++------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/fhem/contrib/FB7270/makeimage b/fhem/contrib/FB7270/makeimage
index 7120a8118..8830a12c3 100755
--- a/fhem/contrib/FB7270/makeimage
+++ b/fhem/contrib/FB7270/makeimage
@@ -10,35 +10,21 @@ fi
 rm -rf var
 echo Extracting the fritzbox template
 unzip -qo ../../priv/fritzbox7270_template.zip
+rm -rf fhem/{FHEM,www,docs}
 
+echo Merging
+rm -rf $fw
+tar zxf ../../$fw.tar.gz
+
+cd $fw
+cp -rp fhem.pl fhem.cfg FHEM docs www ../fhem
+cd ..
+rm -rf $fw
+
+rm -rf fhem/docs/*.{odg,pdf,man,txt}
 cp fhemcmd.sh fhem/FHEM
 cp startfhem fhem
 
-echo Extracting $fw
-rm -rf $fw
-tar zxf ../../$fw.tar.gz
-cd $fw
-cp fhem.pl ../fhem
-cp FHEM/*\
-        webfrontend/pgm2/*\
-        docs/*.html\
-        docs/fhem.png\
-        docs/*.jpg\
-        ../fhem/FHEM
-
-cd examples
-for i in *; do
-   cp -r $i ../../fhem/FHEM/example.$i
-done
-cd ../..
-rm -rf $fw
-
-
 echo Packing again
-cd fhem
-cp FHEM/example.sample_pgm2 fhem.cfg
-perl -pi -e 's,/tmp,./log,g' fhem.cfg
-
-cd ..
 zip -qr $fw-fb7270.zip fhem
 rm -rf fhem