Make sure that "target" does NOT end with a slash ("/")

[backup-script.git] / bin / backup-script

diff --git a/bin/backup-script b/bin/backup-script
index 8da13700f2c790a323f4e5558588da531a6ae8ce..3ce8db15e802af8b0393a2830f43ad7739685777 100755 (executable)
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -72,6 +72,7 @@ GotSignal() {
        CleanUp
        echo -n "Aborted: "; date
        echo
+       sleep 3
        exit 9
 }
 
@@ -122,6 +123,9 @@ CreateSubvolume() {
          "btrfs")
                btrfs subvolume create "$volume"  >/dev/null || return 1
                ;;
+         "zfs")
+               zfs create "$(echo "$volume" | cut -c2-)" || return 1
+               ;;
          *)
                echo "CreateSubvolume: Incompatible FS type \"$fs\" on \"$dir\"!"
                return 9
@@ -135,6 +139,7 @@ CloneSubvolume() {
        local snapshot="$3"
        local dir
        local fs
+       local link_name
 
        dir=$(dirname "source")
        fs=$(GetFS "$source")
@@ -142,6 +147,13 @@ CloneSubvolume() {
          "btrfs")
                btrfs subvolume snapshot "$source" "$snapshot"  >/dev/null || return 1
                ;;
+         "zfs")
+               zfs snapshot "$snapshot" || return 1
+               link_name="$(echo "$snapshot" | cut -d@ -f2-)"
+               ln -s \
+                       "$volume/.zfs/snapshot/$link_name" \
+                       "$(dirname "$volume")/$link_name"
+               ;;
          *)
                echo "CloneSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
                return 9
@@ -159,6 +171,12 @@ RenameSubvolume() {
          "btrfs")
                mv "$source" "$target" || return 1
                ;;
+         "zfs")
+               zfs rename \
+                 "$(echo "$source" | cut -c2-)" \
+                 "$(echo "$target" | cut -c2-)" \
+                       || return 1
+               ;;
          *)
                echo "RenameSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
                return 9
@@ -169,12 +187,24 @@ RenameSubvolume() {
 DeleteSubvolume() {
        local volume="$1"
        local fs
+       local id
+       local snapshot
 
-       fs=$(GetFS "$source")
+       fs=$(GetFS "$volume")
        case "$fs" in
          "btrfs")
                btrfs subvolume delete "$volume" >/dev/null || return 1
                ;;
+         "zfs")
+               id="$(basename "$volume")"
+               if [ -h "$volume" ]; then
+                       snapshot="$(dirname "$volume")/current@$id"
+               else
+                       snapshot="$volume"
+               fi
+               zfs destroy -r "$(echo "$snapshot" | cut -c2-)" >/dev/null || return 1
+               [ -h "$volume" ] && rm "$volume"
+               ;;
          *)
                echo "DeleteSubvolume: Incompatible FS type \"$fs\" on \"$volume\"!"
                return 9
@@ -202,6 +232,25 @@ Initialize_Last_SysTarget_Snapshot() {
                sys_target="$sys_target/$(date +%Y%m%d-%H%M%S)"
                snapshot="$sys_target"
                ;;
+         "zfs")
+               # On ZFS, the last generation is always named "current"
+               if [ -e "$sys_target/current" ]; then
+                       last="$sys_target/current"
+                       if [ "$(uname)" = "Linux" ]; then
+                               date=$(LC_ALL=C stat "$1" | grep "^Modify: " \
+                                | cut -d':' -f2- | cut -d. -f1)
+                       else
+                               date=$(LC_ALL=C stat -f "%Sc" "$1")
+                       fi
+                       date=$(echo "$date" | sed -e's/^ //g' -e 's/[-:]//g' -e 's/ /-/g')
+
+               else
+                       last=""
+                       date="$(date +%Y%m%d-%H%M%S)"
+               fi
+               snapshot="$(echo "$sys_target/current" | cut -c2-)@$date"
+               sys_target="$sys_target/current"
+               ;;
          *)
                echo "Initialize_Last_SysTarget_Snapshot: Incompatible FS type \"$fs\" on \"$sys_target\"!"
                return 1
@@ -334,6 +383,21 @@ for f in $sys; do
        # Validate configuration
        [ "$system" = "localhost" -o "$system" = "127.0.0.1" ] && local=1
 
+       # Make sure "source" ends with a slash ("/")
+       case "$source" in
+         "*/")
+               ;;
+         "*")
+               source="$source/"
+       esac
+
+       # Make sure "target" DOESN'T end with a slash ("/")
+       case "$target" in
+         "*/")
+               target=$( echo "$target" | sed -e 's/\/$//g' )
+               ;;
+       esac
+
        [ "$system" = "$fname" ] \
                && systxt="\"$system\"" \
                || systxt="\"$fname\" [\"$system\"]"
@@ -355,8 +419,12 @@ for f in $sys; do
 
        sys_target="$target/$fname"
        sys_root="$sys_target"
-       if [ "$DRYRUN" -eq 0 ]; then
-               mkdir -p "$sys_target" >/dev/null 2>&1
+       if [ "$DRYRUN" -eq 0 -a ! -e "$sys_target" ]; then
+               if [ $generations -gt 0 ]; then
+                       CreateSubvolume "$sys_target"
+               else
+                       mkdir -p "$sys_target"
+               fi
                if [ $? -ne 0 ]; then
                        echo "Can't create \"$sys_target\"!? \"$system\" skipped!"
                        echo; continue
@@ -403,7 +471,7 @@ for f in $sys; do
                                fi
                                echo "Created new snapshot in \"$snapshot\"."
                        else
-                               echo " *** Trial run, not creating new snapshot in \"$sys_target\"!"
+                               echo " *** Trial run, not creating new snapshot in \"$snapshot\"!"
                        fi
                else
                        # No old backup found, create new subvolume