mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-12 21:10:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

implement some improvements to the diff patch previously committed; this one now includes DIFF and DIFFOPTS as two variables that can be set by the user; thanks to Phillip Warner for the suggestions, and for both Mauro Giachero and slakmagik for coming up with a good implementation.

Browse Source
This commit is contained in:
chess.griffin 2009-02-18 15:08:24 +00:00
parent 3907e6d45d
commit f4a19a469b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/usr/bin/sbopkg
View File

@ -2116,6 +2116,9 @@ pick_file () {
# This function checks to see if there is a locally-edited .info or
# SlackBuild file (which has the *.sbopkg" suffix) and then asks the
# user which one he wants to use to build a package.
# The user can also choose to view a diff of the two before choosing
# between them.
# DIFF defines the diff program used and DIFFOPTS the diff options.
local FILE PKG PICKFILE ANS
rm -f $TMP/sbopkg_file_selection $TMP/sbopkg_diff
@ -2137,7 +2140,8 @@ pick_file () {
fi
PICKFILE="original"
if [[ -f $PKGPATH/$PKG.$FILE.sbopkg ]]; then
diff -u $PKGPATH/$PKG.$FILE{,.sbopkg} > $TMP/sbopkg_diff
${DIFF:-diff} ${DIFFOPTS:--u} $PKGPATH/$PKG.$FILE{,.sbopkg} \
> $TMP/sbopkg_diff
fi
if [[ -s $TMP/sbopkg_diff ]]; then
if [ "$DIAG" = "1" ]; then
@ -2171,6 +2175,7 @@ pick_file () {
done
else
while :; do
echo
crunch_fmt "A local $FILE file for $PKG was found in \
addition to the original $FILE file."
echo "Which one would you like to use?"
@ -2193,7 +2198,6 @@ pick_file () {
;;
esac
done
echo
fi
fi
rm -f $TMP/sbopkg_diff