Merge branch 'testing'

2 files changed, 38 insertions, 26 deletions

diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD
index 11bc623..a4844cb 100644
--- a/abs/core/func/PKGBUILD
+++ b/abs/core/func/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=func
 pkgver=0.25
-pkgrel=12
+pkgrel=16
 pkgdesc="fedora unifed network controller"
 url=""
 license="gpl"
@@ -9,32 +9,32 @@ makedepends=()
 conflicts=()
 replaces=()
 backup=('etc/func/minion.conf')
-moddir="pkg/usr/lib/python2.7/site-packages/func/minion/modules/"
 install=func.install
 source=($pkgname-$pkgver.tar.gz  minion.conf power.py pacman.py failed_func fe_restart.py msg.py msg.cfg func_ssl_patch logrotate-func.conf)
 arch=('i686' 'x86_64')
 
-build() {
-	cd $startdir/src/$pkgname-${pkgver}
-        patch -Np1 < $startdir/src/func_ssl_patch
+package() {
+    moddir="$pkgdir/usr/lib/python2.7/site-packages/func/minion/modules/"
+	cd $srcdir/$pkgname-${pkgver}
+        patch -Np1 < $srcdir/func_ssl_patch
 	python2 setup.py build
-	python2 setup.py install --prefix=$startdir/pkg/usr
-	cd $startdir/src
-	install -m755 -D minion.conf $startdir/pkg/etc/func/minion.conf
-	install -m755 -D $startdir/src/$pkgname-$pkgver/etc/async_methods.conf $startdir/pkg/etc/func/async_methods.conf
-	install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/sample.acl $startdir/pkg/etc/func/minion-acl.d/sample.acl
-	install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/Test.conf $startdir/pkg/etc/func/modules/Test.conf
-	install -m755 -D $startdir/src/power.py ${startdir}/${moddir}/power.py
-	install -m755 -D $startdir/src/pacman.py ${startdir}/${moddir}/pacman.py
-	install -m755 -D $startdir/src/msg.py ${startdir}/${moddir}/msg.py
-	install -m755 -D $startdir/src/msg.cfg ${startdir}/pkg/usr/MythVantage/etc/msg.cfg
-	install -m755 -D $startdir/src/fe_restart.py ${startdir}/${moddir}/fe_restart.py
-	install -m755 -D $startdir/src/failed_func $startdir/pkg/usr/MythVantage/bin/failed_func
-	mkdir -p  $startdir/pkg/var/log/func
-        install -m644 -D ../logrotate-func.conf $startdir/pkg/etc/logrotate.d/func
+	python2 setup.py install --prefix=$pkgdir/usr
+	cd $srcdir
+	install -m755 -D minion.conf $pkgdir/etc/func/minion.conf
+	install -m755 -D $srcdir/$pkgname-$pkgver/etc/async_methods.conf $pkgdir/etc/func/async_methods.conf
+	install -m755 -D $srcdir/$pkgname-${pkgver}/etc/sample.acl $pkgdir/etc/func/minion-acl.d/sample.acl
+	install -m755 -D $srcdir/$pkgname-${pkgver}/etc/Test.conf $pkgdir/etc/func/modules/Test.conf
+	install -m755 -D $srcdir/power.py ${moddir}/power.py
+	install -m755 -D $srcdir/pacman.py ${moddir}/pacman.py
+	install -m755 -D $srcdir/msg.py ${moddir}/msg.py
+	install -m755 -D $srcdir/msg.cfg $pkgdir/usr/MythVantage/etc/msg.cfg
+	install -m755 -D $srcdir/fe_restart.py ${moddir}/fe_restart.py
+	install -m755 -D $srcdir/failed_func $pkgdir/usr/MythVantage/bin/failed_func
+	mkdir -p  $pkgdir/var/log/func
+        install -m644 -D ../logrotate-func.conf $pkgdir/etc/logrotate.d/func
 
-        cd $startdir/pkg
-        find ./usr/bin/*  -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
+        cd $pkgdir
+#        find ./usr/bin/*  -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
         find ./ -name "*.pyc" -print | xargs rm -f
 }
 md5sums=('892252004f122c61bb58bb4607553ffe'
@@ -44,6 +44,6 @@ md5sums=('892252004f122c61bb58bb4607553ffe'
          'c30f420c01628a08061270e8502115c5'
          'b02a733b7a74569e57521bc3708724a5'
          '7b4266a8031cf7de485bf6b74e57bd74'
-         '28e141f04ccbdde1199b41888e102dc9'
+         'bdd37627c9effd745a051fd2d279975b'
          'b816bdb222e646a7801b218c3a626b0e'
          '7d7c8a334f6b46ae1e5e483854b93924')
diff --git a/abs/core/func/msg.cfg b/abs/core/func/msg.cfg
index fed17a7..0d687c5 100644
--- a/abs/core/func/msg.cfg
+++ b/abs/core/func/msg.cfg
@@ -1,11 +1,23 @@
 [default]
-font_color=green
+font_color=#ebb81c
 display_time=5000
 position=1
-font_type=Times New Roman Italic 48
+font_type=Overlock SC 40
 
 [middle]
-font_color=green
+font_color=#ebb81c
 display_time=5000
 position=4
-font_type=Times New Roman Italic 48
+font_type=Overlock SC 40
+
+[bottom]
+font_color=#ebb81c
+display_time=5000
+position=7
+font_type=Overlock SC 40
+
+[alert]
+font_color=red
+display_time=5000
+position=4
+font_type=Overlock SC 40