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

commit patch from slakmagik to clean up/rework some the dialogs during the queue processing; thanks to slakmagik for the patch and thanks to Mauro Giachero for his comments and review

Browse Source
This commit is contained in:
chess.griffin 2009-02-19 19:57:28 +00:00
parent f4a19a469b
commit 339a1e2d2f
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog-current.txt
View File

@ -8,14 +8,14 @@ enhancements:
queues; thanks to slakmagik for the patch.
* Add ability to search for keywords in the README files using regular
expressions; thanks to slakmagik for the original patch and implementation
and thanks to both slakmagik and Mauro for cleaning it up and addressing
minor issues before the commit.
and thanks to both slakmagik and Mauro Giachero for cleaning it up and
addressing minor issues before the commit.
* Commit a cleanup/misc patch from slakmagik that removes some useless code
and fixes some style issues; thanks to slakmagik for the patch.
* Allow user to interrupt/abort the update progressbar by pressing ESC;
thanks to Mauro for the feature.
thanks to Mauro Giachero for the feature.
* Assorted menu navigation fixes, and document -p switch in sbopkg(8) man
page; thanks to Mauro for these improvements.
page; thanks to Mauro Giachero for these improvements.
* Add ability to view a diff of an edited .info or SlackBuild file before
choosing which one to use; thanks to Phillip Warner for the suggestion and
thanks to Mauro Giachero for helping debug/improve my original
@ -24,11 +24,12 @@ enhancements:
doinst.sh, or *.desktop files; thanks to Phillip Warner for the suggestion
and thanks to slakmagik for the patch implementing this feature.
* Rework the check for root:root permissions when installing packages; now,
it will display the output of ls -l <packagename> and ask the user they
wish to install or abort, rather than only aborting.
it will display the output of ls -l <packagename> and ask if the user
wishes to install or abort, rather than only aborting.
* Allow the usage of the -d, -f and -v command-line options in dialog mode,
and spit an error message when the command line contains unrecognized
tokens.
* Implement a workaround so that the dialog interface now works with
rxvt-based terminals. Thanks to Phillip Warner for raising the issue.
rxvt-based terminals. Thanks to Phillip Warner for raising the issue and
thanks to Mauro Giachero for working on the implementation.
+--------------------------+

18
src/usr/bin/sbopkg
View File

@ -2302,15 +2302,6 @@ process_queue () {
echo "PACKAGE BUILDING/INSTALLATION PRECHECK LOG" >> $PRECHECKLOG
echo "Using SlackBuilds.org $SLACKVER repository" >> $PRECHECKLOG
echo >> $PRECHECKLOG
if [ "$DIAG" = 1 ]; then
dialog --title "Pre-Check" --msgbox "$(crunch "Checking for \
valid package names, optional arguments, and processing \
local .info and .SlackBuild edits.")" 8 40
else
echo "Checking for valid package names, optional arguments,"
echo "and processing local .info and .SlackBuild edits."
echo
fi
for CHKBUILD in $(cat $STARTQUEUE); do
unset PKG
search_package $CHKBUILD
@ -2338,11 +2329,8 @@ process_queue () {
done
echo "******************************************" >> $PRECHECKLOG
if [ "$DIAG" = 1 ]; then
dialog --title "Pre-Check Log" --textbox $PRECHECKLOG 0 0
dialog --title "Begin?" --yes-label "Ok" --no-label "Cancel" \
--yesno "$(crunch "The build queue is ready to process. \
Press <OK> to continue or <Cancel> to return to the main \
menu.")" 8 40
dialog --title "Pre-Check Log" --yes-label "Continue" \
--no-label "Back" --yesno "$(cat $PRECHECKLOG)" 0 0
if [ $? != 0 ]; then
rm -f $PKGPATH/$PKG*.build
rm -f $STARTQUEUE $FINALQUEUE $PRECHECKLOG $SUMMARYLOG
@ -2538,7 +2526,7 @@ queue_menu () {
while :; do
if has_root; then
ROOT_OPTS=(
"Process" "Process the build queue"
"Process" "Process the current build queue"
)
HEIGHT=5
else