mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-12 21:10:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

commit the last of a large group of patches from slakmagik; this one modifies the add_item_to_queue function and provides a bit more information to the user; thanks to slakmagik for the patch; I would also like to take a moment to specifically thank both slakmagik and Mauro Giachero for their review of these patches, and their work to improve them and work out the kinks; there has been a /lot/ of patches and stuff flying around and they have been a big help at keeping it all straight

Browse Source
This commit is contained in:
chess.griffin 2009-02-21 04:02:18 +00:00
parent e6183c8595
commit c584e7d765
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/usr/bin/sbopkg
View File

@ -1332,26 +1332,25 @@ edit_build_queue () {
}
add_item_to_queue () {
local APP VERSIONBUILD ONOFF TMPQUEUE
# This function takes three arguments: APP, VERSIONBUILD, and ONOFF. If
# APP is already in the queue, ask user if they want to replace it (so
# updated pkgs will get updated in the queue).
APP=$1
VERSIONBUILD=$2
ONOFF=$3
TMPQUEUE=$TMP/sbopkg-tmp-queue
if grep -q "^$APP " $TMPQUEUE 2>/dev/null; then
dialog --title "WARNING" --yesno "$(crunch "$APP is already in the \
queue. Do you want to replace it? Press <Yes> to replace or \
press <No> to skip.")" 10 50
if [ $? = 0 ]; then
sed -i "s/^$APP .*$/$APP $VERSIONBUILD $ONOFF/" $TMPQUEUE
else
dialog --title "Skipped" --msgbox "$(crunch "$APP was \
skipped.")" 8 40
return
fi
# APP is already in the queue and is of a different version, ask user if
# they want to replace it (so updated pkgs will get updated in the queue).
local APP=$1
local VERSIONBUILD=$2
local ONOFF=$3
local TMPQUEUE=$TMP/sbopkg-tmp-queue
local OLDVER="$(awk '/^'$APP'/{ print $2 }' $TMPQUEUE 2>/dev/null)"
if grep "^$APP " $TMPQUEUE 2>/dev/null | grep -qv "$VERSIONBUILD"; then
dialog --title "WARNING" --yesno "$(crunch "$APP $OLDVER is \
already in the queue. Do you want to replace it with $APP \
$VERSIONBUILD? Press <Yes> to replace or press <No> to \
skip.")" 10 50
if [ $? = 0 ]; then
sed -i "s/^$APP .*$/$APP $VERSIONBUILD $ONOFF/" $TMPQUEUE
fi
elif grep -q "^$APP " $TMPQUEUE 2>/dev/null; then
: # it's the same app and version so toss it
else
echo "$APP $VERSIONBUILD $ONOFF" >> $TMP/sbopkg-tmp-queue
fi