diff options
| -rwxr-xr-x | abs/core/LinHES-system/PKGBUILD | 8 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/diskspace.sh | 4 | ||||
| -rw-r--r-- | abs/core/LinHES-system/lh_message.sh | 27 | ||||
| -rw-r--r-- | abs/core/LinHES-system/msg_osd.py (renamed from abs/core/LinHES-system/xmsg.py) | 0 |
4 files changed, 12 insertions, 27 deletions
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index d807f78..2cfe372 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=54 +pkgrel=55 arch=('i686' 'x86_64') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -14,7 +14,7 @@ binfiles="LinHES-start optimize_mythdb.py unclutter-toggle.sh tvterm.sh mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh - xmsg.py install_supplemental_service.sh + msg_osd.py install_supplemental_service.sh lh_system_backup_job lh_system_restore_job lh_system_host_update @@ -26,7 +26,7 @@ binfiles="LinHES-start optimize_mythdb.py msg_client.py msg_daemon.py gen_is_xml.py" source=(LinHES-session LinHES-profile.sh $binfiles alsa-base myth_mtc.lr - diskspace smolt.cron cacheclean.cron readme_is_xml) + diskspace cacheclean.cron readme_is_xml) build() { cd $startdir/src @@ -50,7 +50,7 @@ build() { install -m644 -D $startdir/src/alsa-base $startdir/pkg/etc/modprobe.d/alsa-base.conf install -m644 -D $startdir/src/readme_is_xml $startdir/pkg/etc/gen_is_xml.d/readme_is_xml - install -m755 -D $startdir/src/smolt.cron $startdir/pkg/etc/cron.weekly/smolt.cron + # install -m755 -D $startdir/src/smolt.cron $startdir/pkg/etc/cron.weekly/smolt.cron install -m755 -D $startdir/src/cacheclean.cron $startdir/pkg/etc/cron.weekly/cacheclean.cron install -m755 -D $startdir/src/diskspace $startdir/pkg/etc/cron.tenminutes/diskspace mkdir $startdir/pkg/etc/logrotate.d diff --git a/abs/core/LinHES-system/diskspace.sh b/abs/core/LinHES-system/diskspace.sh index 34e00cf..dd8596c 100755 --- a/abs/core/LinHES-system/diskspace.sh +++ b/abs/core/LinHES-system/diskspace.sh @@ -17,6 +17,7 @@ CUT='/usr/bin/cut' HOSTNAME='/usr/bin/hostname' DATE='/bin/date' OSD_CAT='/usr/bin/osd_cat' +MSG_CLIENT='/usr/LH/bin/msg_client.py" export DISPLAY=:0.0 # # Static System Variables @@ -72,7 +73,8 @@ $DF -HPl | $GREP -E "^/dev/" | $AWK '{ print $5 " " $6 " " $1 }' | while read OU else echo "WARNING: ${PARTITION} (${DEVICE}) is ${USED_PCENT}% full on ${THIS_HOST}." #| if [ $OSD = true ] && [ ${PARTITION} = / ]; then - echo "WARNING: The root (${PARTITION}) partition is ${USED_PCENT}% full on ${THIS_HOST}." | $OSD_CAT --pos=top --offset=40 --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & + #echo "WARNING: The root (${PARTITION}) partition is ${USED_PCENT}% full on ${THIS_HOST}." | $OSD_CAT --pos=top --offset=40 --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & + $MSG_CLIENT "WARNING: The root (${PARTITION}) partition is ${USED_PCENT}% full on ${THIS_HOST}." fi fi fi diff --git a/abs/core/LinHES-system/lh_message.sh b/abs/core/LinHES-system/lh_message.sh index deddcff..f186bf3 100644 --- a/abs/core/LinHES-system/lh_message.sh +++ b/abs/core/LinHES-system/lh_message.sh @@ -1,4 +1,8 @@ #!/bin/bash +# This script is called by msd_daemon.py and used to display messages on the osd_cat +# May be called directly but best used through msg_daemon + + MYTH_RUN_STATUS="1" . /etc/profile . /etc/systemconfig @@ -19,33 +23,12 @@ fi font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" } - -# function delay_osd(){ -# if [ x$STARTUP_STYLE = xmythvantage ] -# then -# cmd="ps -ef | grep -v grep | grep -q xmsg.py" -# else -# cmd="ps -ef | grep -v grep | grep -q osd_cat" -# fi -# -# eval $cmd -# -# rc=$? -# while [ $rc = 0 ] -# do -# eval $cmd -# rc=$? -# done -# -# -# } - function msg_osd(){ DISPLAY=127.0.0.1:0 echo -e "$1" | DISPLAY=127.0.0.1:0 osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font } function msg_pyosd(){ - DISPLAY=127.0.0.1:0 /usr/LH/bin/xmsg.py -m "$1" + DISPLAY=127.0.0.1:0 /usr/LH/bin/msg_osd.py -m "$1" } function msg(){ diff --git a/abs/core/LinHES-system/xmsg.py b/abs/core/LinHES-system/msg_osd.py index 669a796..669a796 100644 --- a/abs/core/LinHES-system/xmsg.py +++ b/abs/core/LinHES-system/msg_osd.py |