FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 07:16:03 +00:00
Code Issues Releases Wiki Activity

debianfhemde: scripts updated

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13678 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-03-12 10:18:04 +00:00
parent 7eff452654
commit 7f275ebbae
6 changed files with 48 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/contrib/debianfhemde/debianfhemde/html/stable.html
View File

@ -1,30 +0,0 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="../style/style.css" />
<script type="text/javascript">
if (top == self) top.location = "../index.html";
</script>
<meta http-equiv="pragma" content="no-cache" />
</head>
<body>
<a name="stable"></a>
<h3>Use aptitude to install fhem (stable package from current release) and all dependencies</h3>
<ul>
<li>Import repository gpg key:<br/><br/>
<ul><code>wget -qO - http://debian.fhem.de/archive.key | apt-key add -</code></ul></li><br/>
<li>Add repository to /etc/apt/sources.list:<br/></br>
<ul><code>deb http://debian.fhem.de/stable/ /</code></ul></li><br/>
<li>Update your package administration:<br/></br>
<ul><code>apt-get update</code></ul></li></br>
<li>Install fhem:<br/></br>
<ul><code>apt-get install fhem</code></ul></li><br/>
<li>(optional) Remove repository from /etc/apt/sources.list:<br/></br>
<ul><code>#deb http://debian.fhem.de/stable/ /</code></ul></li><br/>
</ul>
<br/>
</body>
</html>

0
fhem/contrib/debianfhemde/debianfhemde/nightly/.gitkeep
View File

0
fhem/contrib/debianfhemde/debianfhemde/stable/.gitkeep
View File

44
fhem/contrib/debianfhemde/debianfhemde/style/style.css
View File

@ -3,8 +3,13 @@ body { background-color: #FFFFE7;
input { font-family:Arial, sans-serif; font-size:16px; } input { font-family:Arial, sans-serif; font-size:16px; }
select { font-family:Arial, sans-serif; font-size:16px; } select { font-family:Arial, sans-serif; font-size:16px; }
#werbefrei { margin-top:10px; margin-left:30px; width:120px;
content:url(../grafik/werbefrei.png); }
#aws { margin-top:10px; margin-left:30px; width:120px; height:45px; #aws { margin-top:10px; margin-left:30px; width:120px; height:45px;
content:url(../grafik/aws.png); } content:url(../grafik/aws.png); }
#nocookies { margin-top:10px; margin-left:30px; width:120px;
content:url(../grafik/cookies_free.png); }
#logo { margin-top:10px; margin-left:30px; width:120px; height:132px; #logo { margin-top:10px; margin-left:30px; width:120px; height:132px;
background-image:url(../grafik/fhemicon.png); } background-image:url(../grafik/fhemicon.png); }
#menu { margin-top:10px; margin-left:20px; width:140px; } #menu { margin-top:10px; margin-left:20px; width:140px; }
@ -18,9 +23,10 @@ select { font-family:Arial, sans-serif; font-size:16px; }
position:absolute; top:0px; left:40px; z-index: 10; } position:absolute; top:0px; left:40px; z-index: 10; }
.devType { padding-top:20px; } .devType { padding-top:20px; }
a { color: #278727; } a { color: #278727; }
p.a { color: #278727; text-align: center; } a_s { color: #278727; font-size: 75%; }
p.asmall { color: #278727; text-align: center; font-size: 75%; } p.a { color: #278727; text-align: center; }
p.a_s { color: #278727; text-align: center; font-size: 75%; }
img { border-style: none; } img { border-style: none; }
@ -45,37 +51,5 @@ button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; }
a img { border-style:none; } a img { border-style:none; }
.col2 { text-align:center; } .col2 { text-align:center; }
/* detail-selector & slider */
.makeTable { display:inline; float:left; clear:left;
margin-top:10px; margin-bottom:20px;}
.makeSelect { display:inline; float:left; clear:left; }
select { margin-left:5px; margin-right:5px; }
.get,.set,.attr { margin-bottom:5px; float:left; }
.slider { float:left; width:250px; height:26px; }
/* detail only */
.makeSelect .slider {background:#F0F0D8; border-radius:8px;}
/* timepicker */
.set .set { margin-bottom:2px; margin-top:3px; }
.handle { position:relative; cursor:pointer; width:50px;
height:20px; line-height:20px;
-webkit-user-select:none; -moz-user-select:none; -user-select:none;
border:3px solid; color:#278727; text-align:center; }
.downText { margin-top:2px; }
pre { white-space: pre-wrap; } pre { white-space: pre-wrap; }
svg { height:32px; width:32px; fill:#278727; }
svg.on,svg.FS20_on { fill:orange; }
/* next lines are for remotecontrol */
.rc_body { border-style: solid; border-color: gray; border-width: 2px; padding: 5px;
background: #C8C8B0; font-size:6px;}
.rc_button { padding: 5px 7px;}
.rc_button img { border-style: solid; border-width: 1px; border-color: transparent; }
.rc_button img:active { border-color: gray; }
.changed { color:red; }

50
fhem/contrib/debianfhemde/scripts/mkfhemnightly
View File

@ -8,34 +8,39 @@
# may be called with optional parameter "quiet" # may be called with optional parameter "quiet"
# #
QUIET=$1
clear clear
echo "#" echo "#"
echo "# Starting FHEM package build" echo "# Starting FHEM package build (nightly)"
echo "#" echo "#"
# remove old version infos QUIET=$1
# DATE=`date +%d.%m.%y`
#rm ~/scripts/templates/nversion.shtml TIME=`date +%X`
#rm ~/scripts/templates/major.shtml
######################################################################
# update svn repo # update svn repo
# #
cd ~/fhem.svn cd ~/fhem.svn
if [ "$QUIET" = "quiet" ] if [ "$QUIET" = "quiet" ]
then svn update > /dev/null then svn update > /dev/null
else svn update else svn update
fi fi
MAJOR=`cat Makefile |grep '^VERS=' |sed 's/VERS=//' |sed 's/\r//'`
MINOR=`svn info | grep 'Revision' | awk '{ print $2; }'`
#
######################################################################
######################################################################
# replace version infos in various html files # replace version infos in various html files
# because Amazon S3 does not support shtml # because Amazon S3 does not support shtml
# #
MAJOR=`cat Makefile |grep '^VERS=' |sed 's/VERS=//' |sed 's/\r//'`
MINOR=`svn info | grep 'Revision' | awk '{ print $2; }'`
DATE=`date +%d.%m.%y`
TIME=`date +%X`
echo "# $MAJOR.$MINOR" echo "# $MAJOR.$MINOR"
echo "#" echo "#"
echo "# $DATE $TIME" echo "# $DATE $TIME"
@ -55,10 +60,16 @@ mv nightly.html ../debianfhemde/html/
cp templates/manual.template manual.html cp templates/manual.template manual.html
sed -i s/==MAJOR==/$MAJOR/g manual.html sed -i s/==MAJOR==/$MAJOR/g manual.html
mv manual.html ../debianfhemde/html/ mv manual.html ../debianfhemde/html/
#exit # for debugging
#
######################################################################
######################################################################
# build nightly deb package # build nightly deb package
# #
echo "#" echo "#"
echo "# processing Makefile - be patient..." echo "# processing Makefile - be patient..."
echo "#" echo "#"
@ -67,23 +78,39 @@ if [ "$QUIET" = "quiet" ]
then make --silent deb then make --silent deb
else make deb else make deb
fi fi
mkdir -p ~/debianfhemde/nightly > /dev/null
mv fhem-$MAJOR.deb ~/debianfhemde/nightly/ mv fhem-$MAJOR.deb ~/debianfhemde/nightly/
#
######################################################################
######################################################################
# create package informations for aptitude # create package informations for aptitude
# and sign all the stuff # and sign all the stuff
# #
echo "#" echo "#"
echo "# creating package index for aptitude" echo "# creating package index for aptitude"
echo "#" echo "#"
cd ~/debianfhemde/ cd ~/debianfhemde/
apt-ftparchive packages nightly > nightly/Packages apt-ftparchive packages nightly > nightly/Packages
sed -i s/nightly.//g nightly/Packages sed -i s/nightly.//g nightly/Packages
cd nightly
gzip -c Packages > Packages.gz
cd ..
apt-ftparchive release nightly > nightly/Release apt-ftparchive release nightly > nightly/Release
gpg --batch --yes --passphrase-file ~/.gnupg/passphrase.txt --clearsign -o nightly/InRelease nightly/Release
gpg --batch --yes --passphrase-file ~/.gnupg/passphrase.txt --output nightly/Release.gpg -bas nightly/Release gpg --batch --yes --passphrase-file ~/.gnupg/passphrase.txt --output nightly/Release.gpg -bas nightly/Release
#
######################################################################
######################################################################
# sync to Amazon S3 Instance # sync to Amazon S3 Instance
# #
echo "# starting sync" echo "# starting sync"
echo "#" echo "#"
cd ~/debianfhemde cd ~/debianfhemde
@ -93,5 +120,6 @@ if [ "$QUIET" = "quiet" ]
fi fi
echo "# done." echo "# done."
echo "#" echo "#"
###
#
######################################################################

13
fhem/contrib/debianfhemde/scripts/mkfhemstable
View File

@ -1,13 +0,0 @@
#!/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-file ~/.gnupg/passphrase.txt --output stable/Release.gpg -bas stable/Release
cd ~/debianfhemde
aws s3 sync . s3://debian.fhem.de --delete