Merging release-0.3.1

diff --git a/schema.sql b/schema.sql
deleted file mode 100644 (file)
index 5022b71..0000000
--- a/schema.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE TABLE filedata (
-  filetype         CHAR,
-  permissions      VARCHAR,
-  username         VARCHAR,
-  groupname        VARCHAR,
-  filesize         INTEGER,
-  modified_date    INTEGER, -- e.g. 20051016194000 for Oct 10, 2005 at 7:40pm
-  filename         VARCHAR,
-  last_backup_date INTEGER  -- same format as modified_date
-);
-
-CREATE UNIQUE INDEX filename ON filedata( filename );

diff --git a/scripts/NOTES b/scripts/NOTES
deleted file mode 100644 (file)
index e7e4b00..0000000
--- a/scripts/NOTES
+++ /dev/null
@@ -1 +0,0 @@
-No notes for you

diff --git a/scripts/config.sh b/scripts/config.sh
index d0cf74a86539d1193907aa4e5257dd6dbbb54d31..cbe6294b71c9ee80d3c1c8de7c3fe50bab437957 100755 (executable)
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -11,6 +11,7 @@ lastbackupfile="$imagedir/lastbackup"
 dev="/dev/dvdrw"
 sdev="ATA:1,0,0"
 noburnfile="$imagedir/noburn"
+backupeveryXdays=15
 
 # These are exported so lsbackups can have access to them
 export backupdbin="$datadir/backups.db"

diff --git a/scripts/cron-pack.sh b/scripts/cron-pack.sh
index 906b010ac1c15048a5cda03e48174df938c8f3fd..f34489a0d3d59ac909b0d228a7c3d5435556b3de 100755 (executable)
--- a/scripts/cron-pack.sh
+++ b/scripts/cron-pack.sh
@@ -8,8 +8,7 @@ export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 # source the system specific configuration
 [ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
-days=15
-minutes=$(($days * 1440 - 60))
+minutes=$(($backupeveryXdays * 1440 - 60))
 
 if [ -n "$(find $lastbackupfile -mmin +$minutes)" -o -n "$(cat $statusfile | grep -i incomplete)" ]; then
   echo "Running backups from cron..."

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 2bdb75e920134b46ee49e9d8ca9756eae10d93c6..05290353374ffae80689d09d72d106b2b64365fe 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -22,6 +22,11 @@ isoimage="$imagedir/$today.iso"
 isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
+echo "-> Checking for available disk space on $imagedir"
+available=$(df $imagedir | awk '{print$4}' | grep -E "[0-9]+")
+required=$((imagesizemb*1024))
+[ $required -gt $available ] && err "Not enough space for the backup image on $imagedir"
+
 echo "-> Creating directories"
 mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
 if [ $? != 0 ]; then
@@ -71,7 +76,7 @@ echo "-> Running find to get the status of files"
   done
 } > $currentfiles
 
-if [ -n $simulate ]; then
+if [ -n "$simulate" ]; then
   backupdbin=$backupdbout
 fi
 
@@ -82,7 +87,7 @@ echo "-> Determining list of files to backup with lsbackups"
   cat $currentfiles
 } | lsbackups > $backups 2>$statusfile
 
-if [ -n $simulate ]; then
+if [ -n "$simulate" ]; then
    umount $isomountdir
    rm -rf $isomountdir $isoimage
    cat $statusfile