debianfhemde: update

git-svn-id: https://svn.fhem.de/fhem/trunk@13533 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/contrib/debianfhemde/debianfhemde/html/default.html

@@ -14,7 +14,7 @@
     All procedures are intended to create FHEM installations from scratch. <br/>
     Do not use these procedures for updates/upgrades!<br/>
 <br/>
-<font color="red"><b>gpg key changed on 2016-12-26,</b><br>
+ <font color="red"><b>gpg key changed on 2016-12-26,</b><br>
 see section "gpg key Trouble" in navigation bar for further details.</font>
 
 </body>

fhem/contrib/debianfhemde/debianfhemde/style/style.css

@@ -18,8 +18,9 @@ select   { font-family:Arial, sans-serif; font-size:16px; }
                position:absolute; top:0px; left:40px; z-index: 10; }
 .devType { padding-top:20px; }
 
-a {  color: #278727; }
+a   { color: #278727; }
-p.a { color: #278727; }
+p.a { color: #278727; text-align: center; }
+p.asmall { color: #278727; text-align: center; font-size: 75%; }
 
 img {  border-style: none; }
 

fhem/contrib/debianfhemde/scripts/mkfhemnightly

@@ -1,66 +1,92 @@
 #!/bin/sh
 #
 # $Id$
-#
 # create nightly build and transfer it to static webspace
 # (C) 2013-2017 betateilchen
 #
-
+QUIET=$1
 clear
+echo "#"
+echo "# Starting package build"
+echo "#"
 
 # remove old version infos
 #
-rm ~/scripts/templates/nversion.shtml
+#rm ~/scripts/templates/nversion.shtml
-rm ~/scripts/templates/major.shtml
+#rm ~/scripts/templates/major.shtml
 
 
 # update svn repo
 #
 cd ~/fhem.svn
-svn update
+if [ "$QUIET" = "quiet" ]
-
+  then svn update > /dev/null
+  else svn update
+fi
 
 # replace version infos in various html files
 # because Amazon S3 does not support shtml
 #
-svn info | grep 'Revision' | awk '{ print $2; }'           > ~/scripts/templates/nversion.shtml
+MAJOR=`cat Makefile |grep '^VERS=' |sed 's/VERS=//' |sed 's/\r//'`
-cat Makefile |grep '^VERS=' |sed 's/VERS=//' |sed 's/\r//' > ~/scripts/templates/major.shtml
+MINOR=`svn info | grep 'Revision' | awk '{ print $2; }'`
-
+DATE=`date +%d.%m.%y`
+TIME=`date +%X`
+echo "# $MAJOR.$MINOR"
+echo "#"
+echo "# $DATE $TIME"
+echo "#"
+echo "# updating templates with version infos"
 cd ~/scripts
 cp templates/index.template index.html
-sed -i s/==MINOR==/`cat templates/nversion.shtml`/g index.html
+sed -i s/==MAJOR==/$MAJOR/g index.html
+sed -i s/==MINOR==/$MINOR/g index.html
+sed -i s/==DATE==/$DATE/g   index.html
+sed -i s/==TIME==/$TIME/g   index.html
 mv index.html ../debianfhemde/
-
 cp templates/nightly.template nightly.html
-sed -i s/==MAJOR==/`cat templates/major.shtml`/g    nightly.html
+sed -i s/==MAJOR==/$MAJOR/g    nightly.html
-sed -i s/==MINOR==/`cat templates/nversion.shtml`/g nightly.html
+sed -i s/==MINOR==/$MINOR/g nightly.html
 mv nightly.html ../debianfhemde/html/
-
 cp templates/manual.template manual.html
-sed -i s/==MAJOR==/`cat templates/major.shtml`/g manual.html
+sed -i s/==MAJOR==/$MAJOR/g manual.html
 mv manual.html ../debianfhemde/html/
 
 
 # build nightly deb package
 #
+echo "#"
+echo "# processing Makefile - be patient..."
+echo "#"
 cd ~/fhem.svn
-make deb
+if [ "$QUIET" = "quiet" ]
-mv fhem-5.8.deb ~/debianfhemde/nightly/
+   then make --silent deb
+   else make deb
+fi
+mv fhem-$MAJOR.deb ~/debianfhemde/nightly/
 
 
 # create package informations for aptitude
 # and sign all the stuff
 #
+echo "#"
+echo "# creating package index for aptitude"
+echo "#"
 cd ~/debianfhemde/
 apt-ftparchive packages nightly > nightly/Packages
 sed -i s/nightly.//g nightly/Packages
 apt-ftparchive release  nightly > nightly/Release
-gpg --batch --yes --passphrase <passphrase> --output nightly/Release.gpg -bas nightly/Release
+gpg --batch --yes --passphrase ... --output nightly/Release.gpg -bas nightly/Release
 
 # sync to Amazon S3 Instance
 #
+echo "# starting sync"
+echo "#"
 cd ~/debianfhemde
-aws s3 sync . s3://debian.fhem.de --delete
+if [ "$QUIET" = "quiet" ]
-
+   then aws s3 sync . s3://debian.fhem.de --delete > /dev/null
+   else aws s3 sync . s3://debian.fhem.de --delete; echo "#";
+fi
+echo "# done."
+echo "#"
 ###
 

fhem/contrib/debianfhemde/scripts/mkfhemstable

@@ -1,14 +1,12 @@
 #!/bin/sh
-
 # $Id$
-
 cd ~/debianfhemde/
 
 apt-ftparchive packages stable > stable/Packages
 sed -i s/stable.//g stable/Packages
 
 apt-ftparchive release  stable > stable/Release
-gpg --batch --yes --passphrase <passphrase> --output stable/Release.gpg -bas stable/Release
+gpg --batch --yes --passphrase ... --output stable/Release.gpg -bas stable/Release
 
 cd ~/debianfhemde
 aws s3 sync . s3://debian.fhem.de --delete

fhem/contrib/debianfhemde/scripts/templates/index.template

@@ -1,5 +1,6 @@
 <html>
 <head>
+<!-- ==DATE== ==TIME== -->
 <title>FHEM for Debian</title>
 <link rel="stylesheet" type="text/css"     href="../style/style.css"   />
 <link rel="icon"       type="image/x-icon" href="./grafik/favicon.ico" />
@@ -23,13 +24,18 @@
         <tr><td></td></tr>
         <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/stable.html'">Stable build using apt</p></td></tr>
         <tr><td></td></tr>
-        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/nightly.html'">Nightly ==MINOR== using apt</p></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/nightly.html'">Nightly build using apt</p></td></tr>
         <tr><td></td></tr>
 <!--        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/https_trouble.html'">https Trouble?</p></td></tr>
         <tr><td></td></tr> -->
         <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/gpg_trouble.html'">gpg key Trouble</p></td></tr>
         <tr><td></td></tr>
         <tr><td><hr/></td></tr>
+        <tr><td><b>Nightly build:</b></td></tr>
+        <tr><td></td></tr>
+        <tr><td><p class="asmall">Rev ==MAJOR==.==MINOR==<br/>==DATE== ==TIME==</p></td></tr>
+        <tr><td></td></tr>
+        <tr><td><hr/></td></tr>
         <tr><td><b>Links:</b></td></tr>
         <tr><td></td></tr>
         <tr><td><p class="a" onclick="window.open('http://fhem.de','_blank')">FHEM Home</p></td></tr>
@@ -43,7 +49,7 @@
       </table>
       </table>
     </div>
-<!--    <div id="aws"></div> -->
+    <div id="aws"></div>
   </div>
 
   <div id="right"><iframe id="rightcontent" name="rightcontent" style="border:0px;" width="100%" height="100%" src="./html/default.html"></iframe></div>

fhem/contrib/debianfhemde/scripts/templates/manual.template

@@ -18,7 +18,7 @@
       <li>Download latest stable package:<br/><br/>
         <ul><code>wget http://debian.fhem.de/fhem-==MAJOR==.deb</code></ul></li><br/>
       <li>Install package:<br/><br/>
-        <ul><code>dpkg -i fhem.deb</code></ul></li><br/>
+        <ul><code>dpkg -i fhem-==MAJOR==.deb</code></ul></li><br/>
       <li>If you want to add the fhem user manually, just run the following command::<br/><br/>
         <ul><code>useradd --system --home /opt/fhem --gid dialout --shell /bin/false fhem</code></ul></li><br/>
       <li>You can find the init-script as /opt/fhem/contrib/init-scripts/fhem.3 and copy this to /etc/init.d/fhem<br/><br/>