diff options
Diffstat (limited to 'abs/core')
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 22 | ||||
| -rw-r--r-- | abs/core/LinHES-system/PKGBUILD | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index 8b5bac4..da2f14e 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -46,15 +46,27 @@ export MALLOC_CHECK_=0 font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" } -function msg_osd(){ - ps -ef | grep -v grep | grep osd_cat +function delay_osd(){ + if [ x$STARTUP_STYLE = xmythvantage ] + then + cmd="ps -ef | grep -v grep | grep xmsg.py" + else + cmd="ps -ef | grep -v grep | grep osd_cat" + fi + + eval $cmd + rc=$? while [ $rc = 0 ] do - ps -ef | grep -v grep | grep osd_cat + eval $cmd rc=$? done + + } + +function msg_osd(){ echo -e "$1" | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font } @@ -173,10 +185,10 @@ function show_help_tip(){ } function notify_scan(){ - sleep 2 + delay_osd if [ -e /tmp/scan_report ] then - msg "\n\nNew storage found. \nRun /usr/LH/bin/add_storage.py for details" + msg "\nNew storage found. \nRun add_storage.py for details" fi } diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index b1f0ea5..7bb5c16 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=32 +pkgrel=33 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -48,7 +48,7 @@ build() { mkdir $startdir/pkg/etc/logrotate.d cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d } -md5sums=('a0fc7ae1a80b151ab9d247b84c1272a6' +md5sums=('d6a564f3286590875874573107940908' '5881bdb43d578ec3a79d1f77ea58a3db' 'a875ee97f86e46f34a741c2bc455f894' '76b2637cac0452b3acdbeeb4e8a5474b' |