Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2025-01-07 17:24:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not prompt user after each individual app is added to the queue when loading a saved queue (but still provide this feedback for single additions to the queue from info_item or search results; also, do not ask user if they want to keep or delete queue when doing a single build; thanks to alkos333 for the suggestion on the former.

Browse source
This commit is contained in:
chess.griffin 2009-01-27 16:29:02 +00:00
parent 0a7c217a08
commit 58d38b7dec
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/usr/bin/sbopkg
View file

@ -1317,7 +1317,7 @@ load_user_queue () {
TMPQUEUE=$TMP/sbopkg-tmp-queue TMPQUEUE=$TMP/sbopkg-tmp-queue
WORKINGQUEUE=$TMP/sbopkg-working-queue WORKINGQUEUE=$TMP/sbopkg-working-queue
dialog --title "Load Saved Queue" --inputbox "$(crunch "Please enter the \ dialog --title "Load Saved Queue" --inputbox "$(crunch "Please enter the \
path and filename to a saved build queue (if no path is specified, \ path and filename to a saved build queue (if no path is specified, \
then your queue will be saved to $TMP):")" \ then your queue will be saved to $TMP):")" \
10 50 2>$TMP/sbopkg-user-queue 10 50 2>$TMP/sbopkg-user-queue
if [ $? = 0 ]; then if [ $? = 0 ]; then
@ -1345,6 +1345,7 @@ load_user_queue () {
"No saved queue was found." 8 30 "No saved queue was found." 8 30
fi fi
fi fi
rm -f $TMP/sbopkg-user-queue
fi fi
} }
@ -1456,7 +1457,7 @@ add_item_to_queue () {
VERSIONBUILD=$2 VERSIONBUILD=$2
ONOFF=$3 ONOFF=$3
TMPQUEUE=$TMP/sbopkg-tmp-queue TMPQUEUE=$TMP/sbopkg-tmp-queue
if $(cat $TMPQUEUE | grep -q "^$APP "); then if $(cat $TMPQUEUE 2>/dev/null | grep -q "^$APP "); then
dialog --title "WARNING" --yesno "$(crunch "$APP is already in the \ dialog --title "WARNING" --yesno "$(crunch "$APP is already in the \
queue. Do you want to replace it? Press <Yes> to replace or \ queue. Do you want to replace it? Press <Yes> to replace or \
press <No> to skip.")" 10 50 press <No> to skip.")" 10 50
@ -1470,11 +1471,12 @@ add_item_to_queue () {
else else
echo "$APP $VERSIONBUILD $ONOFF" >> $TMP/sbopkg-tmp-queue echo "$APP $VERSIONBUILD $ONOFF" >> $TMP/sbopkg-tmp-queue
fi fi
# Do we need to add a test if this is being done via an update so the user # Only display this if we are not loading a queue; otherwise getting this
# does not get the following message after each individual app has been # after each app was added to the queue may get annoying.
# added but only at the end? Or, maybe leave as is, so users get feedback if [ ! -e $TMP/sbopkg-user-queue ]; then
# on each update that is added to the queue. dialog --title "Done" --msgbox "$(crunch "$APP has been added to \
dialog --title "Done" --msgbox "$APP has been added to the build queue." 8 40 the build queue.")" 8 40
fi
} }
view_queue () { view_queue () {
@ -2392,7 +2394,7 @@ process_queue () {
if [ "$DIAG" = 1 ]; then if [ "$DIAG" = 1 ]; then
read -n 1 -p "Press any key to continue." read -n 1 -p "Press any key to continue."
fi fi
if [ -e $TMP/sbopkg-tmp-queue ]; then if [[ "$BUILDPKGS" = 1 && -e $TMP/sbopkg-tmp-queue ]]; then
dialog --title "Clear Queue?" --yes-label "Keep" --no-label \ dialog --title "Clear Queue?" --yes-label "Keep" --no-label \
"Clear" --yesno "$(crunch "Would you like to keep the build \ "Clear" --yesno "$(crunch "Would you like to keep the build \
queue or would you like to clear it?")" 8 35 queue or would you like to clear it?")" 8 35
@ -2403,6 +2405,7 @@ process_queue () {
fi fi
fi fi
if [ "$KEEPLOG" = "YES" ]; then if [ "$KEEPLOG" = "YES" ]; then
cat $PRECHECKLOG >> $LOGFILE
cat $SBOPKGOUTPUT >> $LOGFILE cat $SBOPKGOUTPUT >> $LOGFILE
cat $SUMMARYLOG >> $LOGFILE cat $SUMMARYLOG >> $LOGFILE
fi fi