Package: backup2l / 1.6-4

16_rearrange-tar-no-recusion-option.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Package:     backup2l
Subject:     Rearrange tar no-recusion option
Author:      Joachim Wiedorn <joodebian at joonet.de>
Bug-Debian:  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=899411
Forwarded:   no
Last-Update: 2018-06-06

Rearrange no-recursion option of tar.
---

diff -urN s15/first-time.conf s16/first-time.conf
--- s15/first-time.conf	2018-06-05 23:47:13.558578656 +0200
+++ s16/first-time.conf	2018-06-06 00:04:12.495420608 +0200
@@ -227,7 +227,7 @@
             ;;
         -create)        # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
             mkdir -p ${3}
-            tar cz -T $4 --no-recursion | split --bytes=725100100 - ${3}/part_
+            tar cz --no-recursion -T $4 | split --bytes=725100100 - ${3}/part_
             ;;
         -toc)           # Arguments: $2 = BID, $3 = archive file name
             cat ${3}/part_* | tar tz | sed 's#^#/#'
@@ -254,7 +254,7 @@
             echo "tar.gz"
             ;;
         -create)        # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
-            tar czf $3 -T $4 --no-recursion --atime-preserve 2>&1 \
+            tar czf $3 --no-recursion -T $4 --atime-preserve 2>&1 \
                 | grep -v 'tar: Removing leading .* from .* names'
             ;;
         -toc)           # Arguments: $2 = BID, $3 = archive file name
@@ -371,7 +371,7 @@
             echo "tar.pgp"
             ;;
         -create)        # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
-            tar -c -T $4 --no-recursion | /usr/bin/gpg --batch --no-tty -q --passphrase-fd 3 3</etc/backup2l.pass -c -  > $3
+            tar -c --no-recursion -T $4 | /usr/bin/gpg --batch --no-tty -q --passphrase-fd 3 3</etc/backup2l.pass -c -  > $3
             ;;
         -toc)           # Arguments: $2 = BID, $3 = archive file name
             /usr/bin/gpg --batch --no-tty -q --passphrase-fd 3 3</etc/backup2l.pass -d $3 2>/dev/null | tar t | sed 's#^#/#'
@@ -403,13 +403,13 @@
             echo "tar.gz"
             ;;
         -create)        # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
-            tar cf $3 -T $4 -I pigz --no-recursion --atime-preserve 2>&1 | grep -v 'tar: Removing leading .* from .* names'
+            tar cf $3 --no-recursion --atime-preserve -I pigz -T $4 2>&1 | grep -v 'tar: Removing leading .* from .* names'
             ;;
         -toc)           # Arguments: $2 = BID, $3 = archive file name
             tar tf $3 -I pigz | sed 's#^#/#'
             ;;
         -extract)       # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
-            tar x --same-permission --same-owner -I pigz -f $3 -T $4 2>&1
+            tar xf $3 --same-permission --same-owner -I pigz -T $4 2>&1
             ;;
     esac
 }
@@ -429,7 +429,7 @@
             echo "tar.lz"
             ;;
         -create)        # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
-            tar -c -T $4 --no-recursion | lzip --best -c > $3 2>&1 \
+            tar -c --no-recursion -T $4 | lzip --best -c > $3 2>&1 \
                 | grep -v 'tar: Removing leading .* from .*'
             ;;
         -toc)           # Arguments: $2 = BID, $3 = archive file name
@@ -454,7 +454,7 @@
             echo "tar.xz"
             ;;
         -create)        # Arguments: $2 = BID, $3 = archive file name, $4 = file list file
-            tar cJf $3 -T $4 --no-recursion --atime-preserve 2>&1 | grep -v 'tar: Removing leading .* from .* names'
+            tar cJf $3 --no-recursion --atime-preserve -T $4 2>&1 | grep -v 'tar: Removing leading .* from .* names'
             ;;
         -toc)           # Arguments: $2 = BID, $3 = archive file name
             tar tJf $3 | sed 's#^#/#'