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

extend last commit to backup queue i.e., do not prompt for each pkg in backup queue as it is loaded; do not tell user items were deleted from queue if nothing was deleted; make the backup silent; update for-next-release

Browse Source
This commit is contained in:
chess.griffin 2009-01-27 16:49:43 +00:00
parent 58d38b7dec
commit f5b861fea9
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
for-next-release
View File

@ -33,8 +33,8 @@ item that failed the download was skipped when the user aborted the queue and
reran it. I could not reproduce this, but need to check it out. SHOULD BE
DONE.
Do ask user if they want to keep or clear queue when doing a single build
(i.e. where BUILDPKGS != 1).
Do not ask user if they want to keep or clear queue when doing a single build
(i.e. where BUILDPKGS != 1). DONE.
Would it be helpful to have a way to run a queue through the update function?
Suppose you have a saved queue with several deps and a final pkg, and some of those

17
src/usr/bin/sbopkg
View File

@ -1302,12 +1302,7 @@ save_backup_queue () {
TMPQUEUE=$TMP/sbopkg-tmp-queue
PERMQUEUE=$TMP/sbopkg-savedqueue
if [ -e $TMPQUEUE ]; then
cp $TMPQUEUE $PERMQUEUE
dialog --title "Saving Temporary Backup Queue" --msgbox \
"$(crunch "Since the queue was not empty upon exiting sbopkg, \
it has been automatically saved to a temporary backup file. If \
you do not want this to happen next time, please be sure the \
build queue is cleared before exiting sbopkg.")" 9 65
mv $TMPQUEUE $PERMQUEUE
fi
}
@ -1430,9 +1425,11 @@ delete_build_queue () {
if [[ ! -s $TMPQUEUE ]]; then
rm -f $TMPQUEUE
fi
dialog --title "Done" --msgbox \
"The items have been removed from the build queue." 8 30
return 0
if [ -e $WORKINGQUEUE ]; then
dialog --title "Done" --msgbox \
"The items have been removed from the build queue." 8 30
return 0
fi
elif [ $CHOICE = 3 ]; then
rm -f $REMOVEQUEUE $TMPQUEUE
dialog --title "Done" --msgbox \
@ -1473,7 +1470,7 @@ add_item_to_queue () {
fi
# Only display this if we are not loading a queue; otherwise getting this
# after each app was added to the queue may get annoying.
if [ ! -e $TMP/sbopkg-user-queue ]; then
if [[ ! -e $TMP/sbopkg-user-queue && ! -e $TMP/sbopkg-savedqueue ]]; then
dialog --title "Done" --msgbox "$(crunch "$APP has been added to \
the build queue.")" 8 40
fi