Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-12-29 10:24:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

queue_dir_lister() tweaks.

Browse source 
Small improvements:
- reduce the number of times the queue directory is scanned
- drop a wrong 'continue' in the error path
- allow having a QUEUEDIR that is a symlink to the actual directory
- improve file cleanup.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
This commit is contained in:
mauro.giachero 2010-02-26 11:07:16 +00:00
parent 0b14ed1cd5
commit 246d57fe2e
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/usr/sbin/sbopkg
View file

@ -1536,15 +1536,18 @@ queue_dir_lister() {
local QFS=$SBOPKGTMP/sbopkg_queue_files_selection local QFS=$SBOPKGTMP/sbopkg_queue_files_selection
local QFM=$SBOPKGTMP/sbopkg_queue_files_menu local QFM=$SBOPKGTMP/sbopkg_queue_files_menu
if [[ -z $(ls -A $QUEUEDIR/*.sqf 2> /dev/null) ]]; then # Note: the trailing slash ensures that this works fine even if $QUEUEDIR
# is a symlink to the actual repository.
find $QUEUEDIR/ -type f -name '*.sqf' -printf "\"%P\" \"\" off\n" \
-maxdepth 1 | sed -e 's/.sqf//' | sort > $QFM
if [[ -z $(< $QFM) ]]; then
if [[ $DIAG ]]; then if [[ $DIAG ]]; then
rm -f $QFM
dialog --title "ERROR" --msgbox "$(crunch "The queue directory \ dialog --title "ERROR" --msgbox "$(crunch "The queue directory \
$QUEUEDIR is empty.")" 8 30 $QUEUEDIR is empty.")" 8 30
continue return 1
fi fi
fi fi
find $QUEUEDIR -type f -name '*.sqf' -printf "\"%P\" \"\" off\n" \
| sed -e 's/.sqf//' | sort > $QFM
# The --default item doesn't work on deletions and renames (because the # 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 # variable expands to a no-longer existing file) but you can't give it an
# index argument, unfortunately # index argument, unfortunately
@ -1554,9 +1557,11 @@ queue_dir_lister() {
# unset this so there's no left over junk and the loop from the # unset this so there's no left over junk and the loop from the
# calling functions doesn't kick in when this returns to them # calling functions doesn't kick in when this returns to them
unset USERQUEUE unset USERQUEUE
return 0 else
USERQUEUE=( $(< $QFS) )
fi fi
USERQUEUE=( $(< $QFS) ) rm -f $QFM $QFS
return 0
} }
can_skip_line() { can_skip_line() {
@ -1583,7 +1588,7 @@ load_user_queue() {
queue_dir_lister "Load Queue" "$(crunch "Select the queue(s) you \ queue_dir_lister "Load Queue" "$(crunch "Select the queue(s) you \
wish to load and choose <OK> or choose <Back> to \ wish to load and choose <OK> or choose <Back> to \
leave this menu.")" leave this menu.")" || return 1
for ((i=0; i<${#USERQUEUE[*]}; i++)); do for ((i=0; i<${#USERQUEUE[*]}; i++)); do
FILE=$QUEUEDIR/${USERQUEUE[$i]//'"'/} FILE=$QUEUEDIR/${USERQUEUE[$i]//'"'/}
@ -1612,7 +1617,7 @@ delete_user_queue() {
queue_dir_lister "Delete Queue" "$(crunch "Select the queue(s) you \ queue_dir_lister "Delete Queue" "$(crunch "Select the queue(s) you \
wish to delete and choose <OK> or choose <Back> to \ wish to delete and choose <OK> or choose <Back> to \
leave this menu.")" leave this menu.")" || return 1
for ((i=0; i<${#USERQUEUE[*]}; i++)); do for ((i=0; i<${#USERQUEUE[*]}; i++)); do
FILE=$QUEUEDIR/${USERQUEUE[$i]//'"'/} FILE=$QUEUEDIR/${USERQUEUE[$i]//'"'/}
@ -1653,7 +1658,7 @@ rename_user_queue() {
queue_dir_lister "Rename Queue" "$(crunch "Select the queue(s) you \ queue_dir_lister "Rename Queue" "$(crunch "Select the queue(s) you \
wish to rename and choose <OK> or choose <Back> to \ wish to rename and choose <OK> or choose <Back> to \
leave this menu.")" leave this menu.")" || return 1
# I have to assign to this because I shrink the array later # I have to assign to this because I shrink the array later
COUNTER=${#USERQUEUE[*]} COUNTER=${#USERQUEUE[*]}