Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2025-01-16 03:41:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

do not show files that end in '~' in queue dir lister; when importing lines from a user queue, check and skip blank lines and comment lines; fix view_queue call when using 'Process' button in queue menu

Browse source
This commit is contained in:
chess.griffin 2009-05-14 20:36:50 +00:00
parent fe357d64e4
commit 2ced9364a4
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/usr/sbin/sbopkg
View file

@ -1222,7 +1222,7 @@ queue_dir_lister() {
continue
fi
fi
find $QUEUEDIR -type f -printf "\"%P\" \"\" off\n" | sort > $QFM
find $QUEUEDIR -type f -not -name '*~' -printf "\"%P\" \"\" off\n" | sort > $QFM
# The --default item doesn't work on deletions and renames (because the
# variable expands to a no-longer existing file) but you can't give it an
# index argument, unfortunately
@ -1237,6 +1237,20 @@ queue_dir_lister() {
USERQUEUE=( $(< $QFS) )
}
can_skip_line() {
# This function reads in a line and checks if it is blank or starts with a
# comment.
echo $1 | grep "^#" > /dev/null
if [[ $? == 0 ]]; then
return 1
fi
if [[ "$1" == "" ]]; then
return 1
fi
return 0
}
load_user_queue() {
# This function loads a user's specified saved queue and merges it
@ -1254,6 +1268,10 @@ load_user_queue() {
touch $USERQUEUE_LOCK
# Reading from $FILE...
while read PICK; do
can_skip_line $PICK
if [[ $? == 1 ]]; then
continue
fi
add_item_to_queue $PICK
done < $FILE
LAST_USER_QUEUE_ON_DISK=$FILE
@ -3009,8 +3027,8 @@ queue_menu() {
"Edit") edit_build_queue ;;
"Rename") rename_user_queue ;;
"Delete") delete_user_queue ;;
"Process") #empty_queue && return
view_queue
"Process") #empty_queue && continue
view_queue && continue
cp $SBOPKGTMP/sbopkg-ans-queue $STARTQUEUE
start_dialog_queue ;;
*) break ;;