From 1bbc562fce83ce011c59849e9ad74fe2b694ea84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= Date: Sun, 20 Apr 2014 23:22:07 +0800 Subject: [PATCH] Sourced config.sh --- .gitignore | 2 ++ bash/cronbackup/backup.sh | 17 +++++++++-------- bash/cronbackup/config.sh | 7 +++++++ 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 bash/cronbackup/config.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ef2717 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +*.log diff --git a/bash/cronbackup/backup.sh b/bash/cronbackup/backup.sh index a50cbd4..ea6bd05 100644 --- a/bash/cronbackup/backup.sh +++ b/bash/cronbackup/backup.sh @@ -1,18 +1,17 @@ #!/bin/bash +source ./config.sh + # IO Redirection -exec > backup.log +exec > $LOGFILE -# exec 2> backup_err.log +exec 2> $ERRLOG -BMOUNT=/mnt/backup -BAKDIR=$BMOUNT/backup/cron - -if ! grep -qs $BMOUNT /proc/mounts; then +if [[ -n $BMOUNT ]] && ! grep -qs $BMOUNT /proc/mounts; then echo Mounting $BMOUNT ... mount $BMOUNT + MOUNTED=$? fi - if ! [ -d $BAKDIR ]; then mkdir $BAKDIR @@ -86,4 +85,6 @@ while read line; do # echo --\> $line done < backup_list -umount $BMOUNT +if [[ "$MOUNTED" -eq 0 ]]; then + umount $BMOUNT +fi diff --git a/bash/cronbackup/config.sh b/bash/cronbackup/config.sh new file mode 100644 index 0000000..319ecee --- /dev/null +++ b/bash/cronbackup/config.sh @@ -0,0 +1,7 @@ +#!/bin/bash` + +LOGFILE=backup.log +ERRLOG=backup_errors.log + +BMOUNT=/mnt/backup +BAKDIR=$BMOUNT/backup/cron