Small fixes, preparing for the 5.1 release

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@930 2b470e98-0d58-463d-a4d8-8e2adae1ed80

contrib/FB7390/fhemcmd.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+## FritzBox 7390
+## Beispiel fuer das Senden von FHEM Kommandos ueber den Telefoncode
+## #95*x* wobei x hier 1 bzw 2 entspricht.
+
+case $1 in
+1) echo "set Steckdose on" | /sbin/socat -  TCP:127.0.0.1:7072
+   ;;
+2) echo "set Steckdose off" | /sbin/socat - TCP:127.0.0.1:7072
+   ;;
+esac
+
+

contrib/FB7390/install

@@ -0,0 +1,65 @@
+#! /bin/sh
+
+root=/var/InternerSpeicher
+home=$root/fhem
+
+echo "########################### FHEM INSTALL BEGIN #######################"
+killall perl > /dev/null 2>&1
+sleep 1
+
+echo "########################### Extracting fhem.tar.gz ###################"
+cd $root
+if test -d fhem; then
+  mv fhem fhem.OLD
+fi
+
+gzip -cd /var/fhem.tar.gz | tar xf -
+
+cd $root
+
+# Save files from the AVM Style installation
+if test -f fhem.OLD/opt/etc/fhem.cfg; then
+  echo "########################### Converting chroot style config ###########"
+  export LD_LIBRARY_PATH=$home/lib
+  export PERL5LIB=$home/lib/perl5/site_perl/5.12.2/mips-linux:$home/lib/perl5/site_perl/5.12.2:$home/lib/perl5/5.12.2/mips-linux:$home/lib/perl5/5.12.2
+  cp fhem.OLD/opt/etc/fhem.cfg fhem
+  fhem/perl -pi -e 's,/opt,$root,g;
+                    s,fhem/share,fhem,;
+                    s,^#define autocreate,define autocreate,;
+                    s,^#attr autocreate,attr autocreate,;
+                    s,ttyACM(.)(@\d+)?,ttyACM$1\@38400,;' fhem/fhem.cfg
+  mv fhem.OLD/opt/fhem/log/* fhem/log
+fi
+
+# Save files from our old version
+if test -f fhem.OLD/fhem.cfg; then
+  echo "########################### Copying non-chroot style config ##########"
+  mv fhem.OLD/FHEM/*.sh fhem/FHEM
+  mv fhem.OLD/FHEM/99.*Util.pm fhem/FHEM
+  mv fhem.OLD/FHEM/*.sh fhem/FHEM
+  mv fhem.OLD/log/* fhem/log
+  mv fhem.OLD/fhem.cfg fhem
+fi
+chown -R boxusr80:root $home
+
+if test -d fhem.OLD; then
+  echo "########################### Deleting the old directory ###############"
+  rm -rf fhem.OLD
+fi
+
+cat /var/flash/debug.cfg > /var/nvi.tmp
+grep -q fhem /var/nvi.tmp
+r=$?
+if test $r != 0; then
+  echo "########################### Modifying the startup script #############"
+  echo $home/startfhem >> /var/nvi.tmp
+  cat /var/nvi.tmp > /var/flash/debug.cfg
+fi
+rm -f /var/nvi.tmp
+
+echo "########################### Starting fhem ############################"
+sync
+$home/startfhem
+
+echo "########################### FHEM INSTALL END #########################"
+exit 1 # INSTALL_SUCCESS_REBOOT

contrib/FB7390/makeimage

@@ -0,0 +1,55 @@
+#!/bin/sh
+
+fw=$1
+if test ! -f ../../$fw.tar.gz; then
+  echo "usage: makeimage <fhem-VERSION.tar.gz>"
+  echo "../../<fhem-VERSION>.tar.gz mus exist"
+  exit 1
+fi
+
+rm -rf var
+echo Extracting the fritzbox template
+tar xf ../../priv/fritzbox7390_template.tar
+cd var
+tar zxf fhem.tar.gz
+rm -rf fhem/FHEM
+mkdir fhem/FHEM
+cd ..
+
+cp install var
+cp startfhem var/fhem
+cp fhemcmd.sh var/fhem/FHEM
+
+
+echo Extracting $fw
+rm -rf $fw
+tar zxf ../../$fw.tar.gz
+cd $fw
+cp fhem.pl\
+        FHEM/*\
+        webfrontend/pgm2/*\
+        docs/*.html\
+        docs/fhem.png\
+        docs/*.jpg\
+        ../var/fhem/FHEM
+
+cd examples
+for i in *; do
+   cp -r $i ../../var/fhem/FHEM/example.$i
+done
+cd ../..
+rm -rf $fw
+
+
+echo Packing again
+cd var/fhem
+cp FHEM/example.sample_pgm2 fhem.cfg
+perl -pi -e 's,/tmp,./log,g' fhem.cfg
+
+cd ..
+tar zcf fhem.tar.gz fhem
+rm -rf fhem
+
+cd ..
+tar cf $fw-fb7390.image var
+rm -rf var

contrib/FB7390/startfhem

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+home=/var/InternerSpeicher/fhem
+
+cd $home
+
+trap "" SIGHUP
+modprobe cdc_acm
+sleep 2
+
+ln -sf $home/FHEM/fhemcmd.sh /var/fhemcmd
+
+PATH=$home:$PATH
+export PATH
+
+export LD_LIBRARY_PATH=$home/lib
+export PERL5LIB=$home/lib/perl5/site_perl/5.12.2/mips-linux:$home/lib/perl5/site_perl/5.12.2:$home/lib/perl5/5.12.2/mips-linux:$home/lib/perl5/5.12.2
+
+perl fhem.pl fhem.cfg