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

add stripcom() and use it in save_user_queue() to make sure we're only

Browse source 
comparing relevant things when deciding whether to save the queue on exit
This commit is contained in:
slakmagik 2009-05-24 20:57:04 +00:00
parent 09664bf11d
commit fc84284c3d
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/usr/sbin/sbopkg
View file

@ -1457,6 +1457,16 @@ rename_user_queue() {
done done
} }
stripcom() {
local _file="$1"
sed '
/^[ \t]*#/d
s/[ \t][ \t]*#.*//
/^[ \t]*$/d
' $_file
}
save_user_queue() { save_user_queue() {
# This function saves the build queue to the filename the user specifies. # This function saves the build queue to the filename the user specifies.
# If --end is specified as first parameter, assume that the user is # If --end is specified as first parameter, assume that the user is
@ -1484,7 +1494,8 @@ save_user_queue() {
if [[ ! -s $TMPQUEUE ]]; then if [[ ! -s $TMPQUEUE ]]; then
return 1 return 1
elif [[ -f $LAST_USER_QUEUE_ON_DISK ]] && elif [[ -f $LAST_USER_QUEUE_ON_DISK ]] &&
diff $LAST_USER_QUEUE_ON_DISK $SAVEQUEUE > /dev/null; then diff <(stripcom $LAST_USER_QUEUE_ON_DISK) $SAVEQUEUE &> \
/dev/null; then
# The active queue is unchanged since the last loaded/saved one # The active queue is unchanged since the last loaded/saved one
return 0 return 0
else else
@ -1522,8 +1533,9 @@ save_user_queue() {
if [[ -e $USERQUEUE_NAME.sboq ]]; then if [[ -e $USERQUEUE_NAME.sboq ]]; then
dialog --title "ERROR" --yesno "$(crunch "Another file \ dialog --title "ERROR" --yesno "$(crunch "Another file \
with that name already exists. Press <Yes> to \ with that name already exists. Press <Yes> to \
continue and overwrite the other file, or press <No> \ continue and overwrite the other file (keep in mind that \
to cancel.")" 10 50 the active queue will not preserve any comments from an \
on-disk queue), or press <No> to cancel.")" 10 50
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
continue continue
fi fi