From ddf28766b17e070a1488b7e4eb3ea67c6b7c94fe Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 2 Nov 2014 16:06:23 +0000
Subject: LinHES-system: lh_system_job: add some excludes
cacheclean: adjust pacman cache dir
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/cacheclean | 4 ++--
abs/core/LinHES-system/lh_system_backup_job | 14 ++++++++++----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index ad23218..a8bc443 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.2
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -91,13 +91,13 @@ md5sums=('a10cb96850951ae835c46f41f92463b2'
'33fbebbd546672cedd3c5e7350ab414e'
'c773d8caacba8fbd4968e8afe5137bc6'
'3edef50a49a47694bf8add39cc160add'
- 'b376c30f95892b8682fad84f81685f75'
+ '80b1e46cb4e4dda9dfb1a8c4c13dc909'
'bc69a520add58ede9b060c73e67ace13'
'74e17d6f7453c52d56fecaed5c3f6ad5'
'47e093e8cfe4b5b96602358e1f540832'
'63bbc62240f46a9997eaae4a84b09b76'
'2c005d95312018bef80092136f80f254'
- '6519d209e151cdc39ae7e1091d189c3e'
+ 'c8db6a83ecc089ea37ab7fcb0f7a01cf'
'ca63946920ba33de1f15abda83e74e40'
'84c0ea62550b0bf9d84ab48eddc08276'
'3e60b17892e5b8214d47dcfddf5215a4'
diff --git a/abs/core/LinHES-system/cacheclean b/abs/core/LinHES-system/cacheclean
index cfc8d58..24032c9 100755
--- a/abs/core/LinHES-system/cacheclean
+++ b/abs/core/LinHES-system/cacheclean
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-"""cacheclean - a simple python script to clean up the /data/var/cache/pacman/pkg directory.
+"""cacheclean - a simple python script to clean up the /data/storage/disk0/pacman/pkg directory.
More versatile than 'pacman -Sc' in that you can select how many old versions
to keep.
Usage: cacheclean {-p} {-v} <# of copies to keep>
@@ -78,7 +78,7 @@ except getopt.GetoptError as msg:
sys.exit(1)
# change to the pkg directory & get a sorted list of its contents
-os.chdir('/data/var/cache/pacman/pkg')
+os.chdir('/data/storage/disk0/pacman/pkg')
pkg_fns = os.listdir('.')
pkg_fns.sort()
diff --git a/abs/core/LinHES-system/lh_system_backup_job b/abs/core/LinHES-system/lh_system_backup_job
index 3ac9de0..a286387 100644
--- a/abs/core/LinHES-system/lh_system_backup_job
+++ b/abs/core/LinHES-system/lh_system_backup_job
@@ -84,12 +84,18 @@ function backup(){
if [ ! -f $MYTHHOME/backup_config/backup_exclude.txt ]
then
mkdir -p $MYTHHOME/backup_config/
- echo ".mythtv/themecache" > $MYTHHOME/backup_config/backup_exclude.txt
- echo "tmp" >> $MYTHHOME/backup_config/backup_exclude.txt
- echo ".vnc/*log" >> $MYTHHOME/backup_config/backup_exclude.txt
- echo ".vnc/*pid" >> $MYTHHOME/backup_config/backup_exclude.txt
+ touch $MYTHHOME/backup_config/backup_exclude.txt
chmod 777 $MYTHHOME/backup_config/backup_exclude.txt
fi
+ for i in ".mythtv/themecache" ".mythtv/remotecache" ".mythtv/Cache-myth*" ".cache" "tmp" ".vnc/*log" ".vnc/*pid"
+ do
+ grep -qF "$i" $MYTHHOME/backup_config/backup_exclude.txt
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ echo "$i" >> $MYTHHOME/backup_config/backup_exclude.txt
+ fi
+ done
tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt $MYTHHOME /home/vncsvc /home/xymon
--
cgit v0.12