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 </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 }