tjh.dev
1diff -rc checkinstall-orig/checkinstall checkinstall/checkinstall
2*** checkinstall-orig/checkinstall 2009-03-12 13:40:24.000000000 +0100
3--- checkinstall/checkinstall 2009-03-27 14:51:55.000000000 +0100
4***************
5*** 1635,1644 ****
6
7 # Find regular files first
8 [ $DEBUG -gt 0 ] && echo "debug: BASE_TMP_DIR: $BASE_TMP_DIR"
9! cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[[:space:]]*(unlink|access)' | cut -f 3 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | sort -u > /${TMP_DIR}/newfiles
10
11 # symlinks are next
12! cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[[:space:]]*(unlink|access)' | cut -f 4 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | grep -v "#success" | sort -u >> /${TMP_DIR}/newfiles
13 # Create another list of modified files that exclude all files the
14 # install script wanted to create but did not, e.g because they already
15 # existed.
16--- 1635,1648 ----
17
18 # Find regular files first
19 [ $DEBUG -gt 0 ] && echo "debug: BASE_TMP_DIR: $BASE_TMP_DIR"
20! cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[[:space:]]*(unlink|access|mkdir)' | cut -f 3 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | sort -u > /${TMP_DIR}/newfiles
21
22 # symlinks are next
23! cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[[:space:]]*(unlink|access|mkdir)' | cut -f 4 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | grep -v "#success" | sort -u >> /${TMP_DIR}/newfiles
24!
25! # And finally newly created directories.
26! cat /${TMP_DIR}/newfiles.tmp | egrep '^0[[:space:]]+mkdir[[:space:]]+' | cut -f 3 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | sort -u >> /${TMP_DIR}/newfiles
27!
28 # Create another list of modified files that exclude all files the
29 # install script wanted to create but did not, e.g because they already
30 # existed.
31***************
32*** 1738,1746 ****
33 cd /
34
35 ( cat /${TMP_DIR}/newfiles | while read i; do
36! if [ ! -d "${TRANSLROOT}${i}" -o -L "${TRANSLROOT}${i}" ]; then
37! echo ".${i}"
38! fi
39 done ) > /${TMP_DIR}/newfiles-tar
40
41 # Here it gets tricky: we need to copy all new files to our build dir,
42--- 1742,1748 ----
43 cd /
44
45 ( cat /${TMP_DIR}/newfiles | while read i; do
46! echo ".${i}"
47 done ) > /${TMP_DIR}/newfiles-tar
48
49 # Here it gets tricky: we need to copy all new files to our build dir,