mirror of
https://github.com/sbopkg/sbopkg
synced 2025-02-06 08:45:52 +01:00
use new add_item_to_queue function when backup queue is loaded or when user's saved queue is loaded.
This commit is contained in:
parent
59ef49e159
commit
3707f1a3cf
1 changed files with 12 additions and 6 deletions
|
@ -1139,7 +1139,10 @@ load_backup_queue () {
|
||||||
temporary backup queue into the build queue, or press <No> to \
|
temporary backup queue into the build queue, or press <No> to \
|
||||||
cancel.")" 11 65
|
cancel.")" 11 65
|
||||||
if [ $? = 0 ]; then
|
if [ $? = 0 ]; then
|
||||||
mv $PERMQUEUE $TMPQUEUE
|
cat $PERMQUEUE | while read PICK; do
|
||||||
|
add_item_to_queue $PICK
|
||||||
|
done
|
||||||
|
#mv $PERMQUEUE $TMPQUEUE
|
||||||
touch $TMP/sbopkg_backup_queue.lck
|
touch $TMP/sbopkg_backup_queue.lck
|
||||||
dialog --title "Done" --msgbox \
|
dialog --title "Done" --msgbox \
|
||||||
"The backup queue has been loaded." 8 30
|
"The backup queue has been loaded." 8 30
|
||||||
|
@ -1182,11 +1185,14 @@ load_user_queue () {
|
||||||
USERQUEUE=$TMP/$USERQUEUE
|
USERQUEUE=$TMP/$USERQUEUE
|
||||||
fi
|
fi
|
||||||
if [ -e $USERQUEUE ]; then
|
if [ -e $USERQUEUE ]; then
|
||||||
rm -f $WORKINGQUEUE
|
cat $USERQUEUE | while read PICK; do
|
||||||
cat $TMPQUEUE >> $WORKINGQUEUE
|
add_item_to_queue $PICK
|
||||||
cat $USERQUEUE >> $WORKINGQUEUE
|
done
|
||||||
sort $WORKINGQUEUE | uniq > $TMPQUEUE
|
#rm -f $WORKINGQUEUE
|
||||||
rm -f $WORKINGQUEUE
|
#cat $TMPQUEUE >> $WORKINGQUEUE
|
||||||
|
#cat $USERQUEUE >> $WORKINGQUEUE
|
||||||
|
#sort $WORKINGQUEUE | uniq > $TMPQUEUE
|
||||||
|
#rm -f $WORKINGQUEUE
|
||||||
dialog --title "Done" --msgbox \
|
dialog --title "Done" --msgbox \
|
||||||
"The saved queue has been loaded." 8 30
|
"The saved queue has been loaded." 8 30
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Reference in a new issue