mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-09 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Viewing Queue shows repo version after Updates has been run.

Browse Source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Geremia 2020-05-20 16:35:51 -07:00 committed by Willy Sudiarto Raharjo
parent f93839fb32
commit 968ce2a2e1
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/usr/sbin/sbopkg
View File

@ -934,8 +934,6 @@ check_for_updates() {
# enabled. # enabled.
if [[ $DEBUG_UPDATES -ge 1 ]]; then if [[ $DEBUG_UPDATES -ge 1 ]]; then
cp $UPDATELIST $SBOPKGTMP/sbopkg-debug-updatelist cp $UPDATELIST $SBOPKGTMP/sbopkg-debug-updatelist
else
rm $UPDATELIST
fi fi
else else
rm -f $PROGRESSBAR_INTERRUPTED rm -f $PROGRESSBAR_INTERRUPTED
@ -2096,9 +2094,10 @@ add_item_to_queue() {
local LOADOPTIONS="$2" local LOADOPTIONS="$2"
local USERQUEUE_LOCK=$SBOPKGTMP/sbopkg_user_queue.lck local USERQUEUE_LOCK=$SBOPKGTMP/sbopkg_user_queue.lck
local UPDATEQUEUE=$SBOPKGTMP/sbopkg-update-queue local UPDATEQUEUE=$SBOPKGTMP/sbopkg-update-queue
local UPDATELIST=$SBOPKGTMP/sbopkg_updatelist
local QUEUELIST=$SBOPKGTMP/sbopkg_queue_list local QUEUELIST=$SBOPKGTMP/sbopkg_queue_list
local MISSING_LIST_FILE=$SBOPKGTMP/sbopkg_addall_missing local MISSING_LIST_FILE=$SBOPKGTMP/sbopkg_addall_missing
local FILE ONOFF VERSION INSTALLED local FILE ONOFF VERSION NEW_VERSION INSTALLED QUEUESTR
# This next if is for legacy queuefiles with $APP $VERSION$BUILD $ONOFF # This next if is for legacy queuefiles with $APP $VERSION$BUILD $ONOFF
if [[ $3 =~ [Oo][Ff][Ff] ]]; then if [[ $3 =~ [Oo][Ff][Ff] ]]; then
@ -2137,9 +2136,20 @@ add_item_to_queue() {
grep "^$APP-[^-]*-[^-]*-[^-]*$REPO_TAG$") grep "^$APP-[^-]*-[^-]*-[^-]*$REPO_TAG$")
if [[ -n $INSTALLED ]]; then if [[ -n $INSTALLED ]]; then
VERSION=$(sed 's:^.*-\([^-]*\)-[^-]*-[^-]*$:\1:'<<<$INSTALLED) VERSION=$(sed 's:^.*-\([^-]*\)-[^-]*-[^-]*$:\1:'<<<$INSTALLED)
if [[ -e $UPDATELIST ]]; then
NEW_VERSION=$(grep -A 3 '^'$APP':' $UPDATELIST |
sed -e '4!d' -e 's/ Repo version: //' \
-e 's:^.*-\([^-]*\)-[^-]*-[^-]*$:\1:')
fi
if [[ -n $NEW_VERSION ]]; then
QUEUESTR=$(printf "%s \"Installed %-12s → %s\" %s\n" \
$APP $VERSION $NEW_VERSION $ONOFF)
else
QUEUESTR="$APP \"Installed $VERSION\" $ONOFF"
fi
# NOTE: When changing, see the uncheck_installed() comment # NOTE: When changing, see the uncheck_installed() comment
echo "$APP \"Installed $VERSION\" $ONOFF" >> $TMPQUEUE echo "$QUEUESTR" >> $TMPQUEUE
echo "$APP \"Installed $VERSION\" $ONOFF" >> $QUEUELIST echo "$QUEUESTR" >> $QUEUELIST
else else
# NOTE: When changing, see the uncheck_installed() comment # NOTE: When changing, see the uncheck_installed() comment
echo "$APP New $ONOFF" >> $TMPQUEUE echo "$APP New $ONOFF" >> $TMPQUEUE