blob: 9fd483a34d8b899056ff7ce1124f1bcfa3cfe243 (
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
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
|
showdiff() {
BASENAME=$(basename $i .new)
FILEPATH=$(dirname $i)
FULLNAME="${FILEPATH}/${BASENAME}"
if [ -e ${FULLNAME} ]; then
diff -u ${FULLNAME} ${FULLNAME}.new | $MORECMD
else
echo "file $FULLNAME doesn't exist"
fi
}
showmenu() {
echo -e "$1 - \c"
tput sc
shift
while [ $# -gt 0 ]; do
echo -e "$1"
tput rc
shift
done
}
mergenew() {
BASENAME=$(basename $i .new)
FILEPATH=$(dirname $i)
FULLNAME="${FILEPATH}/${BASENAME}"
if [ -e "${FULLNAME}" ]; then
# in media res. we do the merging right away, but we later allow the user to redo it, if not satisfied with the results.
rm -f "${FULLNAME}.smerge"
echo "Enter '?' in the prompt (%) to display help."
cp -p "${FULLNAME}.new" "${FULLNAME}.smerge" # <- this is so that the installed merged file will have the same permissions as the .new file
sdiff -s -o "${FULLNAME}.smerge" "${FULLNAME}" "${FULLNAME}.new"
GOEXM=0
while [ $GOEXM -eq 0 ]; do
showmenu $i "(E)dit the merged file" "(I)nstall the merged file" "View a diff between the merged and the (N)ew file" "View a diff between the (O)ld and the merged file" "(R)edo the merge" "(V)iew the merged file" "(B)ack to previous menu, and delete the merged file"
read ANSWER
case "$ANSWER" in
E|e)
if [ -f "${FULLNAME}.smerge" ]; then
$EDITCMD "${FULLNAME}.smerge"
else
echo -e "Nothing was merged yet..."
fi
;;
I|i)
if [ -f "${FULLNAME}.smerge" ]; then
if [ -e "${FULLNAME}" ] && [ "$ORIG_BACKUPS" != "off" ]; then
mv "${FULLNAME}" "${FULLNAME}.orig"
fi
mv "${FULLNAME}.smerge" "${FULLNAME}"
rm -f "${FULLNAME}.new"
GOEXM=1
GOEX=1
else
echo -e "Nothing was merged yet..."
fi
;;
N|n)
if [ -f "${FULLNAME}.smerge" ]; then
diff -u "${FULLNAME}.smerge" "${FULLNAME}.new" | $MORECMD
else
echo -e "Nothing was merged yet..."
fi
;;
O|o)
if [ -f "${FULLNAME}.smerge" ]; then
diff -u "${FULLNAME}" "${FULLNAME}.smerge" | $MORECMD
else
echo -e "Nothing was merged yet..."
fi
;;
R|r)
rm -f "${FULLNAME}.smerge"
echo "Enter '?' in the prompt (%) to display help."
cp -p "${FULLNAME}.new" "${FULLNAME}.smerge" # <- this is so that the installed merged file will have the same permissions as the .new file
sdiff -s -o "${FULLNAME}.smerge" "${FULLNAME}" "${FULLNAME}.new"
;;
V|v)
if [ -f "${FULLNAME}.smerge" ]; then
$MORECMD "${FULLNAME}.smerge"
else
echo -e "Nothing was merged yet..."
fi
;;
B|b)
rm -f "${FULLNAME}.smerge"
GOEXM=1
;;
esac
done
else
echo "file $FULLNAME doesn't exist"
fi
}
overold() {
BASENAME=$(basename $i .new)
FILEPATH=$(dirname $i)
FULLNAME="${FILEPATH}/${BASENAME}"
if [ -e ${FULLNAME} ] && [ "$ORIG_BACKUPS" != "off" ]; then
mv ${FULLNAME} ${FULLNAME}.orig
fi
mv ${FULLNAME}.new ${FULLNAME}
}
removeold() {
rm $i
}
runvimdiff() {
BASENAME=$(basename $i .new)
FILEPATH=$(dirname $i)
FULLNAME="${FILEPATH}/${BASENAME}"
if [ -e ${FULLNAME} ]; then
vimdiff ${FULLNAME} ${FULLNAME}.new
else
echo "file $FULLNAME doesn't exist"
fi
}
looknew() {
# with ONLY_NEW_DOTNEW set, slackpkg will search only for
# .new files installed in actual slackpkg's execution
if [ "$ONLY_NEW_DOTNEW" = "on" ]; then
ONLY_NEW_DOTNEW="-cnewer $TMPDIR/timestamp"
else
ONLY_NEW_DOTNEW=""
fi
SIZE=$( stty size )
ROWS=${SIZE% *}
LISTMAX=$(( ROWS - 10 ))
printf "%s\n" "Searching for NEW configuration files..."
FILES=$( find \
${ROOT}/etc \
${ROOT}/var/yp \
${ROOT}/usr/share/vim \
-name "*.new" \
${ONLY_NEW_DOTNEW} \
-not -name "rc.inet1.conf.new" \
-not -name "group.new" \
-not -name "passwd.new" \
-not -name "shadow.new" \
-not -name "gshadow.new" 2>/dev/null |
sort -V 2>/dev/null )
if [ -n "$FILES" ]; then
newcount=$( echo "$FILES" | wc -l )
printf "%s %s\n\n" "Some packages had new configuration" \
"files installed ($newcount new files):"
if [ $newcount -le $LISTMAX ]; then
echo "$FILES"
else
F=0
N=0
for FN in $FILES; do
F=$(( F + 1 ))
N=$(( N + 1 ))
echo "$N $FN"
if [ $F -ge $(( ROWS - 5 )) ]; then
F=0
IFS=$( printf "\n" ) read -rn 1 \
-p "
Press SPACE for more, ENTER to skip" junk
printf "\n"
tput -S <<EOF
cuu 1
el 2
cuu 1
el 2
EOF
if [ -z "$junk" ]; then
break
fi
fi
done
fi
echo -ne "\n\
What do you want (K/O/R/P)?
(K)eep the old files and consider .new files later
(O)verwrite all old files with the new ones"
[ "$ORIG_BACKUPS" != "off" ] && echo -ne ". The
old files will be stored with the suffix .orig"
echo -e "\n\n\
(R)emove all .new files
(P)rompt K, O, R selection for every single file"
answer
case $ANSWER in
K|k)
break
;;
O|o)
for i in $FILES; do
overold $i
done
break
;;
R|r)
for i in $FILES; do
removeold $i
done
break
;;
P|p)
echo "Select what you want file-by-file"
for i in $FILES; do
GOEX=0
while [ $GOEX -eq 0 ]; do
echo
showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff"
read ANSWER
case $ANSWER in
O|o)
overold $i
GOEX=1
;;
R|r)
removeold $i
GOEX=1
;;
D|d)
showdiff $1
;;
M|m)
mergenew $1
;;
V|v)
runvimdiff $1
;;
K|k|*)
GOEX=1
;;
esac
done
done
break
;;
*)
echo "
OK! Your choice is nothing! slackpkg will Keep the old files \
for you to deal with later"
;;
esac
else
echo -e "\t\tNo .new files found."
fi
}
lookkernel() {
NEWKERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null)
if [ "$KERNELMD5" != "$NEWKERNELMD5" ]; then
if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && grep -q initrd /etc/lilo.conf ; then
echo -e "\n
Your kernel image was updated, and your /etc/lilo.conf indicates
the use of an initrd for at least one of your kernels. Be sure to
regenerate the initrd for the new kernel and handle any needed
updates to your bootloader.
"
elif [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] ; then
echo -e "\n
Your kernel image was updated. Be sure to handle any needed updates
to your bootloader (possibly as simple as running /sbin/lilo).
"
else
echo -e "\n
Your kernel image was updated, and lilo does not appear to be used on
your system. You may need to adjust your boot manager (like GRUB) to
boot the appropriate kernel (after generating an initrd if required)."
fi
echo -e "Press the \"Enter\" key to continue...\n "
read _junk
fi
}
|