mirror of
https://github.com/sbopkg/sbopkg
synced 2025-02-07 08:46:04 +01:00
correctly test whether we are loading a queue so as to not show a done message after each one is loaded -- introduced in r400 and r401
This commit is contained in:
parent
d65a97ca30
commit
5e44f31e73
1 changed files with 7 additions and 3 deletions
|
@ -1016,11 +1016,12 @@ load_backup_queue () {
|
|||
temporary backup queue into the build queue, or press <No> to \
|
||||
cancel.")" 11 65
|
||||
if [ $? = 0 ]; then
|
||||
touch $TMP/sbopkg_backup_queue.lck
|
||||
cat $PERMQUEUE | while read PICK; do
|
||||
add_item_to_queue $PICK
|
||||
done
|
||||
rm -f $TMP/sbopkg_backup_queue.lck
|
||||
rm $PERMQUEUE
|
||||
touch $TMP/sbopkg_backup_queue.lck
|
||||
dialog --title "Done" --msgbox \
|
||||
"The backup queue has been loaded." 8 30
|
||||
else
|
||||
|
@ -1057,9 +1058,11 @@ load_user_queue () {
|
|||
USERQUEUE=$TMP/$USERQUEUE
|
||||
fi
|
||||
if [ -e $USERQUEUE ]; then
|
||||
touch $TMP/sbopkg_user_queue.lck
|
||||
cat $USERQUEUE | while read PICK; do
|
||||
add_item_to_queue $PICK
|
||||
done
|
||||
rm -f $TMP/sbopkg_user_queue.lck
|
||||
dialog --title "Done" --msgbox \
|
||||
"The saved queue has been loaded." 8 30
|
||||
else
|
||||
|
@ -1195,7 +1198,8 @@ 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 && ! -e $TMP/sbopkg-savedqueue ]]; then
|
||||
if [[ ! -e $TMP/sbopkg_user_queue.lck && \
|
||||
! -e $TMP/sbopkg_backup_queue.lck ]]; then
|
||||
dialog --title "Done" --msgbox "$(crunch "$APP has been added to \
|
||||
the build queue.")" 8 40
|
||||
fi
|
||||
|
@ -2228,7 +2232,7 @@ check_for_latest () {
|
|||
|
||||
queue_menu () {
|
||||
# Separate menu for queue functions.
|
||||
if [ ! -e $TMP/sbopkg_backup_queue.lck ]; then
|
||||
if [ -e $TMP/sbopkg-savedqueue ]; then
|
||||
load_backup_queue
|
||||
fi
|
||||
if [ -z "$Q" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue