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
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
|
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Author Brandon Low <lostlogic@gentoo.org>
#
# Previous version (from which I've borrowed a few bits) by:
# Jochem Kossen <j.kossen@home.nl>
# Leo Lipelis <aeoo@gentoo.org>
# Karl Trygve Kalleberg <karltk@gentoo.org>
if type -p gsed >/dev/null ; then
function sed() { gsed "$@"; }
fi
function get_config() {
item=$1
# First strip off comment lines, then grab the configuration
# item. If there's more than one of the same configuration item,
# then allow the last setting to take precedence.
local result
result=$(cut -d'#' -f1-1 ${PORTAGE_CONFIGROOT}etc/etc-update.conf | \
sed -ne "s/^ *$item *= *\([\"']\{0,1\}\)\(.*\)\1/\2/p" |sed -e '$p;d')
eval echo $result
}
function scan() {
echo "Scanning Configuration files..."
rm -rf ${TMP}/files > /dev/null 2>&1
mkdir ${TMP}/files || die "Failed mkdir command!" 1
count=0
input=0
local find_opts
local my_basename
# Sanity check to make sure diff exists and works
if ! diff -v &>/dev/null ; then
echo "ERROR: 'diff' does not seem to work, aborting"
exit 1
fi
for path in ${CONFIG_PROTECT} ; do
path="${ROOT}${path}"
find_opts="-iname ._cfg????_*"
if [ ! -d "${path}" ]; then
[ ! -f "${path}" ] && continue
my_basename="${path##*/}"
path="${path%/*}"
find_opts="-maxdepth 1 -iname ._cfg????_${my_basename}"
fi
ofile=""
# The below set -f turns off file name globbing in the ${find_opts} expansion.
for file in $(set -f; find ${path}/ ${find_opts} ! -iname '.*~' ! -iname '.*.bak' |
sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\2\%\3:" |
sort -t'%' -k3 -k2 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do
rpath=$(echo "${file/\/\///}" | sed -e "s:/[^/]*$::")
rfile=$(echo "${file/\/\///}" | sed -e "s:^.*/::")
for mpath in ${CONFIG_PROTECT_MASK}; do
mpath="${ROOT}${path}"
if [[ "${rpath}" == "${mpath}"* ]]; then
mv ${rpath}/${rfile} ${rpath}/${rfile:10}
break
fi
done
[ ! -f ${file} ] && continue
if [[ "${ofile:10}" != "${rfile:10}" ]] ||
[[ ${opath} != ${rpath} ]]; then
MATCHES=0
if [[ "${EU_AUTOMERGE}" == "yes" ]]; then
if [ ! -e "${rpath}/${rfile}" ] || [ ! -e "${rpath}/${rfile:10}" ]; then
MATCHES=0
else
diff -Bbua ${rpath}/${rfile} ${rpath}/${rfile:10} | egrep '^[+-]' | egrep -v '^[+-][\t ]*#|^--- |^\+\+\+ ' | egrep -qv '^[-+][\t ]*$'
MATCHES=$?
fi
elif [[ -z $(diff -Nua ${rpath}/${rfile} ${rpath}/${rfile:10}|
grep "^[+-][^+-]"|grep -v '# .Header:.*') ]]; then
MATCHES=1
fi
if [[ "${MATCHES}" == "1" ]]; then
echo "Automerging trivial changes in: ${rpath}/${rfile:10}"
mv ${rpath}/${rfile} ${rpath}/${rfile:10}
continue
else
count=${count}+1
echo "${rpath}/${rfile:10}" > ${TMP}/files/${count}
echo "${rpath}/${rfile}" >> ${TMP}/files/${count}
ofile="${rfile}"
opath="${rpath}"
continue
fi
fi
if [[ -z $(diff -Nua ${rpath}/${rfile} ${rpath}/${ofile}|
grep "^[+-][^+-]"|grep -v '# .Header:.*') ]]; then
mv ${rpath}/${rfile} ${rpath}/${ofile}
continue
else
echo "${rpath}/${rfile}" >> ${TMP}/files/${count}
ofile="${rfile}"
opath="${rpath}"
fi
done
done
}
function sel_file() {
local -i isfirst=0
until [[ -f ${TMP}/files/${input} ]] || \
[[ ${input} == -1 ]] || \
[[ ${input} == -3 ]]
do
local numfiles=$(ls ${TMP}/files|wc -l)
local numwidth=${#numfiles}
for file in $(ls ${TMP}/files|sort -n); do
if [[ ${isfirst} == 0 ]] ; then
isfirst=${file}
fi
numshow=$(printf "%${numwidth}i${PAR} " ${file})
numupdates=$(( $(wc -l <${TMP}/files/${file}) - 1 ))
echo -n "${numshow}"
if [[ ${mode} == 0 ]] ; then
echo "$(head -n1 ${TMP}/files/${file}) (${numupdates})"
else
head -n1 ${TMP}/files/${file}
fi
done > ${TMP}/menuitems
if [ "${OVERWRITE_ALL}" == "yes" ]; then
input=0
elif [ "${DELETE_ALL}" == "yes" ]; then
input=0
else
if [[ ${mode} == 0 ]] ; then
echo "The following is the list of files which need updating, each
configuration file is followed by a list of possible replacement files."
else
local my_title="Please select a file to update"
fi
if [[ ${mode} == 0 ]] ; then
cat ${TMP}/menuitems
echo "Please select a file to edit by entering the corresponding number."
echo " (don't use -3, -5, -7 or -9 if you're unsure what to do)"
echo " (-1 to exit) (-3 to auto merge all remaining files)"
echo " (-5 to auto-merge AND not use 'mv -i')"
echo " (-7 to discard all updates)"
echo -n " (-9 to discard all updates AND not use 'rm -i'): "
input=$(read_int)
else
dialog --title "${title}" --menu "${my_title}" \
0 0 0 $(echo -e "-1 Exit\n$(<${TMP}/menuitems)") \
2> ${TMP}/input || die "User termination!" 0
input=$(<${TMP}/input)
fi
if [[ ${input} == -9 ]]; then
read -p "Are you sure that you want to delete all updates (type YES):" reply
if [[ ${reply} != "YES" ]]; then
continue
else
input=-7
export rm_opts=""
fi
fi
if [[ ${input} == -7 ]]; then
input=0
export DELETE_ALL="yes"
fi
if [[ ${input} == -5 ]] ; then
input=-3
export mv_opts=""
fi
if [[ ${input} == -3 ]] ; then
input=0
export OVERWRITE_ALL="yes"
fi
fi # -3 automerge
if [[ -z ${input} ]] || [[ ${input} == 0 ]] ; then
input=${isfirst}
fi
done
}
function user_special() {
if [ -r ${PORTAGE_CONFIGROOT}etc/etc-update.special ]; then
if [ -z "$1" ]; then
echo "ERROR: user_special() called without arguments"
return 1
fi
while read pat; do
echo ${1} | grep "${pat}" > /dev/null && return 0
done < ${PORTAGE_CONFIGROOT}etc/etc-update.special
fi
return 1
}
function read_int() {
# Read an integer from stdin. Continously loops until a valid integer is
# read. This is a workaround for odd behavior of bash when an attempt is
# made to store a value such as "1y" into an integer-only variable.
local my_input
while true; do
read my_input
# failed integer conversions will break a loop unless they're enclosed
# in a subshell.
echo "${my_input}" | ( declare -i x; read x) && break
done
echo ${my_input}
}
function do_file() {
echo
local -i my_input
local -i fcount=0
until (( $(wc -l < ${TMP}/files/${input}) < 2 )); do
my_input=0
if (( $(wc -l < ${TMP}/files/${input}) == 2 )); then
my_input=1
fi
until (( ${my_input} > 0 )) && (( ${my_input} < $(wc -l < ${TMP}/files/${input}) )); do
fcount=0
if [ "${OVERWRITE_ALL}" == "yes" ]; then
my_input=0
elif [ "${DELETE_ALL}" == "yes" ]; then
my_input=0
else
for line in $(<${TMP}/files/${input}); do
if (( ${fcount} > 0 )); then
echo -n "${fcount}${PAR} "
echo "${line}"
else
if [[ ${mode} == 0 ]] ; then
echo "Below are the new config files for ${line}:"
else
local my_title="Please select a file to process for ${line}"
fi
fi
fcount=${fcount}+1
done > ${TMP}/menuitems
if [[ ${mode} == 0 ]] ; then
cat ${TMP}/menuitems
echo -n "Please select a file to process (-1 to exit this file): "
my_input=$(read_int)
else
dialog --title "${title}" --menu "${my_title}" \
0 0 0 $(echo -e "$(<${TMP}/menuitems)\n${fcount} Exit") \
2> ${TMP}/input || die "User termination!" 0
my_input=$(<${TMP}/input)
fi
fi # OVERWRITE_ALL
if [[ ${my_input} == 0 ]] ; then
my_input=1
elif [[ ${my_input} == -1 ]] ; then
input=0
return
elif [[ ${my_input} == ${fcount} ]] ; then
break
fi
done
if [[ ${my_input} == ${fcount} ]] ; then
break
fi
fcount=${my_input}+1
file=$(sed -e "${fcount}p;d" ${TMP}/files/${input})
ofile=$(head -n1 ${TMP}/files/${input})
do_cfg "${file}" "${ofile}"
sed -e "${fcount}!p;d" ${TMP}/files/${input} > ${TMP}/files/sed
mv ${TMP}/files/sed ${TMP}/files/${input}
if [[ ${my_input} == -1 ]] ; then
break
fi
done
echo
rm ${TMP}/files/${input}
count=${count}-1
}
function do_cfg() {
local file="${1}"
local ofile="${2}"
local -i my_input=0
until (( ${my_input} == -1 )) || [ ! -f ${file} ]; do
if [[ "${OVERWRITE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
my_input=1
elif [[ "${DELETE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
my_input=2
else
showdiffcmd=$(echo "${diff_command}" |
sed -e "s:%file1:${ofile}:" -e "s:%file2:${file}:")
if [ "${using_editor}" == 0 ]; then
(
echo "Showing differences between ${ofile} and ${file}"
${showdiffcmd}
) | ${pager}
else
echo "Beginning of differences between ${ofile} and ${file}"
${showdiffcmd}
echo "End of differences between ${ofile} and ${file}"
fi
if [ -L "${file}" ]; then
echo
echo "-------------------------------------------------------------"
echo "NOTE: File is a symlink to another file. REPLACE recommended."
echo " The original file may simply have moved. Please review."
echo "-------------------------------------------------------------"
echo
fi
echo -n "File: ${file}
1) Replace original with update
2) Delete update, keeping original as is
3) Interactively merge original with update
4) Show differences again
Please select from the menu above (-1 to ignore this update): "
my_input=$(read_int)
fi
case ${my_input} in
1) echo "Replacing ${ofile} with ${file}"
mv ${mv_opts} ${file} ${ofile}
[ -n "${OVERWRITE_ALL}" ] && my_input=-1
[ -e "${file}" ] || touch ${ofile}
continue
;;
2) echo "Deleting ${file}"
rm ${rm_opts} ${file}
[ -n "${DELETE_ALL}" ] && my_input=-1
continue
;;
3) do_merge "${file}" "${ofile}"
my_input=${?}
# [ ${my_input} == 255 ] && my_input=-1
continue
;;
4) continue
;;
*) continue
;;
esac
done
}
function do_merge() {
local file="${1}"
local ofile="${2}"
local mfile="${2}.merged"
local -i my_input=0
echo "${file} ${ofile} ${mfile}"
if [ -e ${mfile} ] ; then
echo "A previous version of the merged file exists, cleaning..."
rm ${rm_opts} ${mfile}
fi
until (( ${my_input} == -1 )); do
echo "Merging ${file} and ${ofile}"
$(echo "${merge_command}" |
sed -e "s:%merged:${mfile}:g" \
-e "s:%orig:${ofile}:g" \
-e "s:%new:${file}:g")
until (( ${my_input} == -1 )); do
echo -n "1) Replace ${ofile} with merged file
2) Show differences between merged file and original
3) Remerge original with update
4) Edit merged file
5) Return to the previous menu
Please select from the menu above (-1 to exit, losing this merge): "
my_input=$(read_int)
case ${my_input} in
1) echo "Replacing ${ofile} with ${mfile}"
chmod --reference=${ofile} ${mfile}
mv ${mv_opts} ${mfile} ${ofile}
[ -e "${mfile}" ] || touch ${ofile}
rm ${rm_opts} ${file}
return 255
;;
2) ( echo "Showing differences between ${ofile} and ${mfile}"
$(echo "${diff_command}" | \
sed -e "s:%file1:${ofile}:" \
-e "s:%file2:${mfile}:") ) | ${pager}
continue
;;
3) break
;;
4) ${EDITOR:-nano -w} "${mfile}"
continue
;;
5) rm ${rm_opts} ${mfile}
return 0
;;
*) continue
;;
esac
done
done
rm ${rm_opts} ${mfile}
return 255
}
function die() {
trap "" TERM
trap "" KILL
echo "Exiting: ${1}"
if [ ${2} -eq 0 ]; then
scan > /dev/null
[ ${count} -gt 0 ] && echo "NOTE: ${count} updates remaining"
fi
rm -rf ${TMP}
exit ${2}
}
#
# Run the script
#
scriptname=$(basename $0)
trap die term
eval $(/usr/lib/portage/bin/portageq envvar -v CONFIG_PROTECT \
CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT)
export PORTAGE_TMPDIR
[ -w ${PORTAGE_CONFIGROOT}etc ] || die "Need write access to ${PORTAGE_CONFIGROOT}etc" 1
#echo $PORTAGE_TMPDIR
#echo $CONFIG_PROTECT
#echo $CONFIG_PROTECT_MASK
#export PORTAGE_TMPDIR=$(/usr/lib/portage/bin/portageq envvar PORTAGE_TMPDIR)
TMP="${PORTAGE_TMPDIR}/$$"
rm -rf ${TMP} 2> /dev/null
mkdir ${TMP} || die "failed mkdir command!" 1
# I need the CONFIG_PROTECT value
#CONFIG_PROTECT=$(/usr/lib/portage/bin/portageq envvar CONFIG_PROTECT)
#CONFIG_PROTECT_MASK=$(/usr/lib/portage/bin/portageq envvar CONFIG_PROTECT_MASK)
# load etc-config's configuration
EU_AUTOMERGE=$(get_config eu_automerge)
rm_opts=$(get_config rm_opts)
mv_opts=$(get_config mv_opts)
cp_opts=$(get_config cp_opts)
pager=$(get_config pager)
diff_command=$(get_config diff_command)
using_editor=$(get_config using_editor)
merge_command=$(get_config merge_command)
declare -i mode=$(get_config mode)
[ -z ${mode} ] && mode=0
[ -z "${pager}" ] && pager="cat"
#echo "rm_opts: $rm_opts, mv_opts: $mv_opts, cp_opts: $cp_opts"
#echo "pager: $pager, diff_command: $diff_command, merge_command: $merge_command"
if (( ${mode} == 0 )); then
PAR=")"
else
PAR=""
fi
declare -i count=0
declare input=0
declare title="Gentoolkit's etc-update tool!"
scan
until (( ${input} == -1 )); do
if (( ${count} == 0 )); then
die "Nothing left to do; exiting. :)" 0
fi
sel_file
if (( ${input} != -1 )); then
do_file
fi
done
die "User termination!" 0
|