blob: 65ae313c44e5cb8c3cb456e53ea69ce43b340272 (
plain)
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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
#!/bin/bash -e
fail () {
echo "$1" 2>&1
exit 1
}
help () {
fail "Usage:
$0 --merge --dst location [--verbose] base-src diff-src1 diff-src2 ..."
}
filter_suffix () {
sed -e 's/.patch$//' -e 's/.delete$//'
}
# exists as file or symbolic link
exfl () {
[ -f "$1" -o -L "$1" ]
}
merge_file () {
c="$(ls $2{,.patch,.delete} 2>/dev/null | wc -l)"
[ $c -le 1 ] || fail "more than one operation available for $2"
if [ $c -eq 0 ]; then
$quiet || echo " ignoring $2"
return 0
else
$quiet || echo " using $2"
fi
if exfl "$2"; then
cp --no-dereference "$2" "$1"
else
exfl "$1" || fail "$1 requested but does not exist"
if [ -f "$2.patch" ]; then
[ -f "$1" ] || fail "$1 is no regular file, not patching"
patch $(! $quiet || echo --silent) -B .trash/ "$1" <"$2.patch"
elif [ -f "$2.delete" ]; then
rm "$1"
fi
fi
}
merge_dir () {
if [ -d $2 ]; then
$quiet || echo "from directory $2"
find $2 -printf "%P\n" | grep -v '^$' | filter_suffix | sort -u | (
while read f; do
if [ -d "$2/$f" ]; then
mkdir -p "$1/$f"
else
merge_file "$1/$f" "$2/$f"
fi
done)
else
$quiet || echo "ignoring $2"
fi
}
# parse cmd line options (except merge srcs)
[ $# -gt 0 ] || help
quiet=true
while [ $# -gt 0 ]; do
case "$1" in
--merge)
op=merge
;;
--verbose)
quiet=false
;;
--dst)
[ $# -gt 1 ] || help
dst="$2"
shift
;;
*)
break
;;
esac
shift
done
[ -n "$op" -a -n "$dst" ] || help
# determine wether merging dirs or files
[ $# -gt 0 ] || help
if [ -f "$1" ]; then
mode=file
elif [ -d "$1" ]; then
mode=dir
[ -d "$dst~" ] && rm -r "$dst~"
mkdir "$dst~"
else
fail "$1 is neiter file nor directory"
fi
# iterate over all dirs
mkdir -p .trash
while [ $# -gt 0 ]; do
${op}_${mode} "$dst~" "$1"
shift
done
[ -d "$dst" ] && rm -r "$dst"
mv "$dst~" "$dst"
rm -r .trash/* 2>/dev/null || true
|
