LinHES-system, linhes-scripts,xymon: move find_orphans.py to LinHES-system and update xymon dep.

7 files changed, 63 insertions, 73 deletions

diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index be0de10..b97034e 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,88 +1,79 @@
 pkgname=LinHES-system
 pkgver=8.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
-MVDIR=$startdir/pkg/usr/LH
-BINDIR=$startdir/pkg/usr/bin
 install=system.install
-pkgdesc="scripts and things related to having an  automated system"
-depends=(linhes-sounds xdotool tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'udisks' 'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu' 'ethtool')
-backup=(etc/modprobe.d/alsa-base)
-binfiles="LinHES-start optimize_mythdb.py
- myth_mtc.py myth_mtc.sh LinHES-run
- load-modules-mythvantage.sh
- unclutter-toggle.sh tvterm.sh
- mythfrontend-start set_windowmanager.sh
- myth_status.py myth_status.sh
+pkgdesc="Everything that makes LinHES an automated system"
+license=('GPL2')
+depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
+        'python_aosd' 'linhes-scripts>=7-24' 'udisks' 
+        'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter'
+        'wmctrl' 'archlinux-xdg-menu' 'ethtool')
+backup=('etc/modprobe.d/alsa-base')
+binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
+ LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
+ mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
  install_supplemental_service.sh
- lh_system_backup
- lh_system_backup_job
- lh_system_restore_job
- lh_system_host_update
- lh_system_all_host_update
- add_storage.py
- diskspace.sh
- cacheclean lh_backend_control.sh switch_web.sh
- create_media_dirs.sh
- msg_client.py msg_daemon.py
+ lh_system_backup lh_system_backup_job lh_system_restore_job
+ lh_system_host_update lh_system_all_host_update
+ add_storage.py diskspace.sh cacheclean lh_backend_control.sh
+ switch_web.sh create_media_dirs.sh msg_client.py msg_daemon.py
  gen_is_xml.py gen_lib_xml.py gen_light_include.py gen_game_xml.py
- misc_recent_recordings.pl
- misc_status_config.py
- misc_status_info.sh
- misc_upcoming_recordings.pl
- misc_which_recorder.pl
+ misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
+ misc_upcoming_recordings.pl misc_which_recorder.pl
  change_channel.sh change_channel_wrapper.sh
- be_check.py
- checkXFSfrag.sh"
+ be_check.py checkXFSfrag.sh find_orphans.py"
 
 source=(LinHES-session
     LinHES-profile.sh $binfiles
     alsa-base myth_mtc.lr
-    diskspace cacheclean.cron xfs_defrag
+    diskspace.cron cacheclean.cron xfs_defrag.cron
     readme_is_xml readme_light add_storage.readme
     system-sudo.rules )
 
-build() {
-        cd $startdir/src
-        install -m755 -D LinHES-session $startdir/pkg/etc/X11/Sessions/LinHES
-    	install -m755 -D LinHES-profile.sh $startdir/pkg/etc/profile.d/LinHES-profile.sh
-        ####### install to /usr/LH/bin
-        for i in $binfiles
-        do
-        	item=$i
-        	install -m755 -D $item $MVDIR/bin/$item
-        	echo "installing $item to $MVDIR"
-        done
+package() {
+    cd $srcdir
 
-#         cd $startdir/bin
-#         for i in *
-#         do
-#         	item=$i
-#         	install -m755 -D $item $MVDIR/bin/$item
-#         	echo "bin stuff: $item"
-#         done
+    MVDIR=$pkgdir/usr/LH
+    BINDIR=$pkgdir/usr/bin
 
-        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 -m644 -D $startdir/src/readme_is_xml $startdir/pkg/etc/gen_lib_xml.d/readme_gen_xml
-        install -m644 -D $startdir/src/readme_is_xml $startdir/pkg/etc/gen_game_xml.d/readme_gen_xml
-        install -m644 -D $startdir/src/readme_light  $startdir/pkg/etc/gen_light_conf.d/readme_gen_light
-        install -m644 -D $startdir/src/add_storage.readme $startdir/pkg/etc/storage.d/readme
-       # 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
-        install -m644 -D $startdir/src/myth_mtc.lr $startdir/pkg/etc/logrotate.d/myth_mtc
-        install -m755 -D $startdir/src/xfs_defrag $startdir/pkg/etc/cron.weekly/xfs_defrag
+    install -m755 -D LinHES-session $pkgdir/etc/X11/Sessions/LinHES
+    install -m755 -D LinHES-profile.sh $pkgdir/etc/profile.d/LinHES-profile.sh
+    
+    #files install to /usr/LH/bin
+    for i in $binfiles
+    do
+        item=$i
+        install -m755 -D $item $MVDIR/bin/$item
+        echo "installing $item to $MVDIR"
+    done
 
+    install -m644 -D $srcdir/alsa-base $pkgdir/etc/modprobe.d/alsa-base.conf
 
-        #sudo rules
-        mkdir -p $startdir/pkg/etc/sudoers.d/
-        chmod 750 $startdir/pkg/etc/sudoers.d/
-        chown -R root:root $startdir/pkg/etc/sudoers.d
-        install -o root -g root -m 0750 $startdir/src/system-sudo.rules $startdir/pkg/etc/sudoers.d/system_sudo
+    #readme files
+    install -m644 -D $srcdir/readme_is_xml $pkgdir/etc/gen_is_xml.d/readme_is_xml
+    install -m644 -D $srcdir/readme_is_xml $pkgdir/etc/gen_lib_xml.d/readme_gen_xml
+    install -m644 -D $srcdir/readme_is_xml $pkgdir/etc/gen_game_xml.d/readme_gen_xml
+    install -m644 -D $srcdir/readme_light  $pkgdir/etc/gen_light_conf.d/readme_gen_light
+    install -m644 -D $srcdir/add_storage.readme $pkgdir/etc/storage.d/readme
 
+    #cron files
+    #install -m755 -D $srcdir/smolt.cron $pkgdir/etc/cron.weekly/smolt.cron
+    install -m755 -D $srcdir/cacheclean.cron $pkgdir/etc/cron.weekly/cacheclean
+    install -m755 -D $srcdir/diskspace.cron $pkgdir/etc/cron.tenminutes/diskspace
+    install -m755 -D $srcdir/xfs_defrag.cron $pkgdir/etc/cron.weekly/xfs_defrag
+
+    #logrotate files
+    install -m644 -D $srcdir/myth_mtc.lr $pkgdir/etc/logrotate.d/myth_mtc
+
+    #sudo rules
+    mkdir -p $pkgdir/etc/sudoers.d/
+    chmod 750 $pkgdir/etc/sudoers.d/
+    chown -R root:root $pkgdir/etc/sudoers.d
+    install -o root -g root -m 0750 $srcdir/system-sudo.rules $pkgdir/etc/sudoers.d/system_sudo
 
 }
+
 md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
          'de32a1c50101265dd7f6ca5037f7a26a'
          'a875ee97f86e46f34a741c2bc455f894'
@@ -124,12 +115,13 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
          'bacc813b48bafcc6fe906e5969930501'
          '8b0298f70f97cc1dc2a58b9a73c64bd3'
          '911b0fbc8d9178dac1a193346c9decaf'
+         '34fc1f58ad1eabf4eff4979d420760c0'
          'eb879fee9603a05d5420d4ce8ed9e450'
          '6782771960c495aeb597893f37d1e5ee'
          '84492954db16740f949d795b74383189'
          '02c810c2f47b7c4495fdacaf54189473'
          '474d5c6883fcfffae4f199aceb3b1356'
-         '1e2ca4dd872a50df6b70528e06df558a'
+         '36bdfa8d877cea20ca3870faf08e08d5'
          '59d0602bac7e06f11abba1894acc8bb0'
          'da432d68962e109e09beb2b71c8c8571'
          '366ccb097d1c221389709485c3b2d159')
diff --git a/abs/core/LinHES-system/diskspace b/abs/core/LinHES-system/diskspace.cron
index ab3c91b..ab3c91b 100755
--- a/abs/core/LinHES-system/diskspace
+++ b/abs/core/LinHES-system/diskspace.cron
diff --git a/abs/core/linhes-scripts/find_orphans.py b/abs/core/LinHES-system/find_orphans.py
index cdc03d4..cdc03d4 100644
--- a/abs/core/linhes-scripts/find_orphans.py
+++ b/abs/core/LinHES-system/find_orphans.py
diff --git a/abs/core/LinHES-system/readme_is_xml b/abs/core/LinHES-system/readme_is_xml
index d2af0f6..f0a13cb 100644
--- a/abs/core/LinHES-system/readme_is_xml
+++ b/abs/core/LinHES-system/readme_is_xml
@@ -1 +1 @@
-Files ending in .conf will be read by gen_is_xml.py or gen_lib_xml.py and output xml as appropriate
+Files ending in .conf will be read by gen_is_xml.py or gen_lib_xml.py or gen_game_xml.py and output xml as appropriate
diff --git a/abs/core/LinHES-system/xfs_defrag b/abs/core/LinHES-system/xfs_defrag.cron
index 4d35507..4d35507 100755
--- a/abs/core/LinHES-system/xfs_defrag
+++ b/abs/core/LinHES-system/xfs_defrag.cron
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 147a035..d376bbb 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=51
+pkgrel=52
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -47,7 +47,6 @@ dtheme.sh
 xwin_find.sh
 upgrade_screen_rc
 upgrade_linhes_script.sh
-find_orphans.py
 acl_fix_fstab.py
 stop_xss.sh
 myth2mkv
@@ -56,7 +55,7 @@ ripD_eject.sh
 get_airplay_key
 )
 
-build() {
+package() {
   cd ${srcdir}
   install -d ${pkgdir}/usr/LH/bin
   install -d ${pkgdir}/usr/LH/etc
@@ -68,7 +67,7 @@ build() {
   cp run-limit-mythcommflag ${pkgdir}/etc/sv/limit-mythcommflag/run
   mkdir -p ${pkgdir}/etc/logrotate.d/
 #  cp pause_mythcommflag ${pkgdir}/etc/logrotate.d/
-  install -m644 -D  pause_mythcommflag $startdir/pkg/etc/logrotate.d/pause_mythcommflag
+  install -m644 -D  pause_mythcommflag ${pkgdir}/etc/logrotate.d/pause_mythcommflag
 
 }
 md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
@@ -106,7 +105,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
          'a94fe6d980f4b810f2e2ae5352084b39'
          '974c137d3fcb85942ba8945a1bc815fe'
          'f454faeabfa153b10389a9a3bfd51c4a'
-         '34fc1f58ad1eabf4eff4979d420760c0'
          'cc9cdabcdfc969c2829b58c0e513488c'
          '54a478660d0f8150fe10112a9ecf2740'
          '503df99218373dfc75e7e7f5e449a44e'
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index a8e2c4b..0c797ee 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=xymon
 pkgname=(xymonserver xymonclient)
 pkgver=4.3.5
-pkgrel=48
+pkgrel=49
 pkgdesc="Hobbit is a system for monitoring servers and networks. "
 license="GPL"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.xymon.com/"
 
 source=(http://hivelocity.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz  hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py  hbnotes.py hobbit-myth-orphan.sh  analysis.cfg hbfunc.py be.png tuner.png tv.png  hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
 
-depends=(rrdtool fping pcre python2 graphviz 'linhes-scripts>=7-24')
+depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'LinHES-system>=8.0-5')
 
 install=xymon.install