Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2025-01-18 10:26:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add a 'diff' entry to the customization menu.

Browse source 
Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
This commit is contained in:
mauro.giachero 2009-06-25 08:03:47 +00:00
parent 9f69b21d0d
commit 13493c7c7c
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog-current.txt
View file

@ -111,4 +111,5 @@ enhancements:
bug report. bug report.
* Add ability to pass build options in a queuefile when separated by a pipe * Add ability to pass build options in a queuefile when separated by a pipe
character, i.e. app | FOO=yes BAR=no character, i.e. app | FOO=yes BAR=no
* Add a 'diff' entry to the script customization menu.
+--------------------------+ +--------------------------+

33
src/usr/sbin/sbopkg
View file

@ -1214,11 +1214,13 @@ customize_item() {
while :; do while :; do
dialog --default-item "$DEFAULTITEM" --title "$APP Customization" \ dialog --default-item "$DEFAULTITEM" --title "$APP Customization" \
--cancel-label "Back" --menu \ --cancel-label "Back" --menu \
"Please choose an item or press <Back> to go back.\n" 15 75 4 \ "Please choose an item or press <Back> to go back.\n" 13 75 6 \
"Edit SlackBuild" "Create and edit a local copy of the SlackBuild" \ "Edit SlackBuild" "Create and edit a local copy of the SlackBuild" \
"Delete SlackBuild" "Delete the local copy of the SlackBuild" \ "Delete SlackBuild" "Delete the local copy of the SlackBuild" \
"Diff SlackBuild" "Compare the local and the original SlackBuild" \
"Edit Info" "Create and edit a local copy of the .info file" \ "Edit Info" "Create and edit a local copy of the .info file" \
"Delete Info" "Delete the local copy of the .info file" \ "Delete Info" "Delete the local copy of the .info file" \
"Diff Info" "Compare the local and the original .info file" \
2> $SBOPKGTMP/sbopkg_custom_selection 2> $SBOPKGTMP/sbopkg_custom_selection
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
DEFAULTITEM="$(< $SBOPKGTMP/sbopkg_custom_selection)" DEFAULTITEM="$(< $SBOPKGTMP/sbopkg_custom_selection)"
@ -1229,12 +1231,18 @@ customize_item() {
"Delete SlackBuild" ) "Delete SlackBuild" )
delete_local_file SlackBuild $SHORTPATH $APP delete_local_file SlackBuild $SHORTPATH $APP
;; ;;
"Diff SlackBuild" )
diff_local_file SlackBuild $SHORTPATH $APP
;;
"Edit Info" ) "Edit Info" )
edit_local_file info $SHORTPATH $APP edit_local_file info $SHORTPATH $APP
;; ;;
"Delete Info" ) "Delete Info" )
delete_local_file info $SHORTPATH $APP delete_local_file info $SHORTPATH $APP
;; ;;
"Diff Info" )
diff_local_file info $SHORTPATH $APP
;;
esac esac
else # Cancel or ESC else # Cancel or ESC
rm -f $SBOPKGTMP/sbopkg_custom_selection rm -f $SBOPKGTMP/sbopkg_custom_selection
@ -2916,6 +2924,29 @@ delete_local_file() {
fi fi
} }
diff_local_file() {
# This function compares the local and original SlackBuild or info file.
# $1 = info|SlackBuild (the extension of the customizable file)
# $2 = application path
# $3 = application name
local FILE=$1
local SHORTPATH=$2
local APP=$3
local DIFF_FILE=$SBOPKGTMP/sbopkg_custom_diff
# FIXME should be checked on the caller side?
if [[ ! -e $SHORTPATH/$APP.$FILE.sbopkg ]]; then
dialog --title "ERROR" --msgbox \
"There is no local copy of the $FILE file to compare." 8 30
else
$DIFF $DIFFOPTS $SHORTPATH/$APP.$FILE{,.sbopkg} > $DIFF_FILE
dialog --exit-label "OK" --title "$FILE diff" \
--textbox $DIFF_FILE 0 0
rm -f $DIFF_FILE
fi
}
pick_file() { pick_file() {
# This function checks to see if there is a locally-edited .info or # This function checks to see if there is a locally-edited .info or
# SlackBuild file (which has the *.sbopkg" suffix) and then asks the # SlackBuild file (which has the *.sbopkg" suffix) and then asks the