mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-20 19:36:02 +00:00
debianfhemde: scripts updated
git-svn-id: https://svn.fhem.de/fhem/trunk@13678 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
parent
7eff452654
commit
7f275ebbae
@ -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>
|
||||
@ -3,8 +3,13 @@ body { background-color: #FFFFE7;
|
||||
input { 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;
|
||||
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;
|
||||
background-image:url(../grafik/fhemicon.png); }
|
||||
#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; }
|
||||
.devType { padding-top:20px; }
|
||||
|
||||
a { color: #278727; }
|
||||
p.a { color: #278727; text-align: center; }
|
||||
p.asmall { color: #278727; text-align: center; font-size: 75%; }
|
||||
a { color: #278727; }
|
||||
a_s { color: #278727; 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; }
|
||||
|
||||
@ -45,37 +51,5 @@ button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; }
|
||||
a img { border-style:none; }
|
||||
.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; }
|
||||
|
||||
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; }
|
||||
|
||||
@ -8,34 +8,39 @@
|
||||
# may be called with optional parameter "quiet"
|
||||
#
|
||||
|
||||
QUIET=$1
|
||||
|
||||
clear
|
||||
echo "#"
|
||||
echo "# Starting FHEM package build"
|
||||
echo "# Starting FHEM package build (nightly)"
|
||||
echo "#"
|
||||
|
||||
# remove old version infos
|
||||
#
|
||||
#rm ~/scripts/templates/nversion.shtml
|
||||
#rm ~/scripts/templates/major.shtml
|
||||
QUIET=$1
|
||||
DATE=`date +%d.%m.%y`
|
||||
TIME=`date +%X`
|
||||
|
||||
|
||||
######################################################################
|
||||
# update svn repo
|
||||
#
|
||||
|
||||
cd ~/fhem.svn
|
||||
if [ "$QUIET" = "quiet" ]
|
||||
then svn update > /dev/null
|
||||
else svn update
|
||||
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
|
||||
# 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 "#"
|
||||
echo "# $DATE $TIME"
|
||||
@ -55,10 +60,16 @@ mv nightly.html ../debianfhemde/html/
|
||||
cp templates/manual.template manual.html
|
||||
sed -i s/==MAJOR==/$MAJOR/g manual.html
|
||||
mv manual.html ../debianfhemde/html/
|
||||
#exit # for debugging
|
||||
|
||||
#
|
||||
######################################################################
|
||||
|
||||
|
||||
######################################################################
|
||||
# build nightly deb package
|
||||
#
|
||||
|
||||
echo "#"
|
||||
echo "# processing Makefile - be patient..."
|
||||
echo "#"
|
||||
@ -67,23 +78,39 @@ if [ "$QUIET" = "quiet" ]
|
||||
then make --silent deb
|
||||
else make deb
|
||||
fi
|
||||
mkdir -p ~/debianfhemde/nightly > /dev/null
|
||||
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
|
||||
cd nightly
|
||||
gzip -c Packages > Packages.gz
|
||||
cd ..
|
||||
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
|
||||
|
||||
#
|
||||
######################################################################
|
||||
|
||||
|
||||
######################################################################
|
||||
# sync to Amazon S3 Instance
|
||||
#
|
||||
|
||||
echo "# starting sync"
|
||||
echo "#"
|
||||
cd ~/debianfhemde
|
||||
@ -93,5 +120,6 @@ if [ "$QUIET" = "quiet" ]
|
||||
fi
|
||||
echo "# done."
|
||||
echo "#"
|
||||
###
|
||||
|
||||
#
|
||||
######################################################################
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user