Merge branch 'master' of ssh://igo@knoppmyth.net/mount/repository/LinHES-PKGBUILD

8 files changed, 72 insertions, 20 deletions

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index c000c02..40413ed 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.0
-pkgrel=13
+pkgrel=15
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo)
diff --git a/abs/core-testing/LinHES-config/mv_advanced.py b/abs/core-testing/LinHES-config/mv_advanced.py
index 01351df..d7c65f1 100755
--- a/abs/core-testing/LinHES-config/mv_advanced.py
+++ b/abs/core-testing/LinHES-config/mv_advanced.py
@@ -66,6 +66,14 @@ def setup_splash(Usebootsplash):
         cmd = ''' sed -i "s/^default.*1/default 0/g" /boot/grub/menu.lst'''
         mv_common.runcmd(cmd)
     return
+def setup_rrd(UseRRD):
+    if UseRRD == "1":
+        logging.info("    Enabling rrd_stats")
+        mv_common.pacinstall("rrd_stats")
+    else:
+        logging.info("    Disabling rrd_stats")
+        mv_common.pacremove("rrd_stats")
+
 
 def setup_hobbit(UseHobbit,SystemType,dbhost):
     if UseHobbit == "1":
@@ -355,6 +363,8 @@ def setup_advanced(systemconfig,data_config):
         setup_hobbit(systemconfig["UseHobbit"],
                     systemconfig["SystemType"],
                     systemconfig["dbhost"])
+    if data_config.SYSTEMTYPE == "LinHES":
+        setup_rrd(systemconfig["UseRRD"])
 
     setup_evrouter(systemconfig["UseEvrouter"],
                    systemconfig["EvrouterConfig"],
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index bd8279e..8875c69 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=14
+pkgrel=15
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,7 +14,7 @@ source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-scripts.tar.bz2)
 build() {
   cd $startdir/src/
   mkdir -p $startdir/pkg/usr/LH/bin
-  cp 770* idle.sh imp* myth* shoo* pau*sh mplayer* vdpau* screen* mplayer* $startdir/pkg/usr/LH/bin
+  install -D -m755 myt2* 770* idle.sh imp* myth* shoo* pau*sh mplayer* vdpau* screen* mplayer* $startdir/pkg/usr/LH/bin
   mkdir -p $startdir/pkg/etc/sv/pause-mythcommflag/supervise
   cp run $startdir/pkg/etc/sv/pause-mythcommflag/
   mkdir -p $startdir/pkg/etc/logrotate.d/
diff --git a/abs/core-testing/mythtv/stable/mythweb/PKGBUILD b/abs/core-testing/mythtv/stable/mythweb/PKGBUILD
index e601ae9..3dded7f 100644
--- a/abs/core-testing/mythtv/stable/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.21
-pkgrel=15
+pkgrel=18
 pkgdesc="Web interface for MythTV's backend"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/stable/mythweb/mythweb.install b/abs/core-testing/mythtv/stable/mythweb/mythweb.install
index 470cbd1..a2aa1bd 100644
--- a/abs/core-testing/mythtv/stable/mythweb/mythweb.install
+++ b/abs/core-testing/mythtv/stable/mythweb/mythweb.install
@@ -1,10 +1,13 @@
 post_install() {
-	echo "You must create a symlink from /home/httpd/html/mythweb/video_dir"
-	echo "to your MythTV recordings directory. Don't forget to change the"
-	echo "permissions so that the webserver can read those files and create"
-	echo "thumbnails."  
+	if [ ! -e /data/srv/httpd/htdocs/mythweb/data/video ]
+	then
+		ln -s /myth/video /data/srv/httpd/htdocs/mythweb/data/video
+	fi
 }
 
+post_upgrade(){
+	post_install $1
+}
 op=$1
 shift
 $op $*
diff --git a/abs/extra-testing/rrd_stats/PKGBUILD b/abs/extra-testing/rrd_stats/PKGBUILD
index 8e027d5..a086380 100644
--- a/abs/extra-testing/rrd_stats/PKGBUILD
+++ b/abs/extra-testing/rrd_stats/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=rrd_stats
 pkgver=1
-pkgrel=9
+pkgrel=12
 pkgdesc="graph system stats"
 arch=('i686' 'x86_64')
 url=""
diff --git a/abs/extra-testing/rrd_stats/rrd_stats.install b/abs/extra-testing/rrd_stats/rrd_stats.install
index be3d2e9..d6aa4ed 100644
--- a/abs/extra-testing/rrd_stats/rrd_stats.install
+++ b/abs/extra-testing/rrd_stats/rrd_stats.install
@@ -1,22 +1,61 @@
 post_install() {
-	line="*/5 * * * *       /usr/local/bin/rrd_hddtemp.pl > /dev/null"
-	(crontab -l; echo "$line") | crontab -
-	line="*/5 * * * *       /usr/local/bin/rrd_disk.pl > /dev/null"
-	(crontab -l; echo "$line") | crontab -
-	line="*/5 * * * *       /usr/local/bin/rrd_traffic.pl > /dev/null"
-	(crontab -l; echo "$line") | crontab -
-	line="*/5 * * * *       /usr/local/bin/rrd_mem.pl > /dev/null"
-	(crontab -l; echo "$line") | crontab -
-	line="*/5 * * * *       /usr/local/bin/rrd_cpu.pl > /dev/null"
-	(crontab -l; echo "$line") | crontab -
+	PFIX="/data/srv/httpd/htdocs/rrd"
+	if [ ! -e $PFIX/index.html.orig ]
+	then
+		mv $PFIX/index.html  $PFIX/index.html.orig
+		ln -s $PFIX/index-rrd.html $PFIX/index.html
+	fi
+
+	ct=`crontab -l`
+	echo $ct | grep -q rrd_hddtemp.pl
+	if [ $? != 0 ]
+	then
+		line="*/5 * * * *       /usr/bin/rrd_hddtemp.pl > /dev/null"
+		(crontab -l; echo "$line") | crontab -
+	fi
+
+	echo $ct | grep -q rrd_disk.pl
+	if [ $? != 0 ]
+	then
+		line="*/5 * * * *       /usr/bin/rrd_disk.pl > /dev/null"
+		(crontab -l; echo "$line") | crontab -
+	fi	
+
+	echo $ct | grep -q rrd_traffic.pl
+	if [ $? != 0 ]
+	then
+		line="*/5 * * * *       /usr/bin/rrd_traffic.pl > /dev/null"
+		(crontab -l; echo "$line") | crontab -
+	fi
+	
+	echo $ct | grep -q rrd_mem.pl
+	if [ $? != 0 ]
+	then
+		line="*/5 * * * *       /usr/bin/rrd_mem.pl > /dev/null"
+		(crontab -l; echo "$line") | crontab -
+	fi
+	
+	echo $ct | grep -q rrd_cpu.pl
+	if [ $? != 0 ]
+	then
+		line="*/5 * * * *       /usr/bin/rrd_cpu.pl > /dev/null"
+		(crontab -l; echo "$line") | crontab -
+	fi
+
 }
 
 post_upgrade() {
- 	/bin/true
+ 	post_install $1
 }
 
 
 pre_remove() {
 	crontab -l | grep -v rrd_ | crontab - 
+	PFIX="/data/srv/httpd/htdocs/rrd"
+	if [  -e $PFIX/index.html.orig ]
+	then
+		rm $PFIX/index.html
+		mv $PFIX/index.html.orig  $PFIX/index.html
+	fi
 
 }
diff --git a/abs/extra-testing/rrd_stats/rrd_stats.tgz b/abs/extra-testing/rrd_stats/rrd_stats.tgz
index 66d2e06..4e27a43 100644
--- a/abs/extra-testing/rrd_stats/rrd_stats.tgz
+++ b/abs/extra-testing/rrd_stats/rrd_stats.tgz