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

fix cosmetic bug where ARCH and BUILD were not displaying correctly in the updates list; thanks to Mauro and slakmagik for the actual working code for this fix

Browse source
This commit is contained in:
chess.griffin 2009-10-08 14:45:27 +00:00
parent 81e337a664
commit 9c775aa684
2 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog-current.txt
View file

@ -1,4 +1,4 @@
Sun Sep 6 04:10:58 UTC 2009 Thu Oct 8 14:44:23 UTC 2009
Sbopkg 0.XX.X released. This version contains the following fixes and Sbopkg 0.XX.X released. This version contains the following fixes and
enhancements: enhancements:
@ -26,4 +26,6 @@ enhancements:
* Modify sspm to be root-only and change the default checkout location. In * Modify sspm to be root-only and change the default checkout location. In
case it isn't obvious, this means the checkout will be root-owned if it case it isn't obvious, this means the checkout will be root-owned if it
isn't already. isn't already.
* Fix cosmetic bug where ARCH and BUILD were not displaying correctly in
list of updates on x86_64.
+--------------------------+ +--------------------------+

30
src/usr/sbin/sbopkg
View file

@ -698,18 +698,9 @@ check_for_updates() {
# Extract the new package version # Extract the new package version
if [[ ! -z $NEWSB ]]; then if [[ ! -z $NEWSB ]]; then
NEWARCH=$(egrep -m1 "^ARCH" $NEWSB | sed ' eval NEW$(grep -m1 ^ARCH= $NEWSB)
s/\([^\t #]*\)[\t #].*/\1/ eval NEW$(grep -m1 ^BUILD= $NEWSB)
s/[^=]*=// [[ -z $NEWARCH ]] && NEWARCH=unknown
s/"//g
s/\${[^-]*-\(.*\)}/\1/
s/\$.*/unknown/
')
NEWBUILD=$(egrep -m1 "^BUILD" $NEWSB | sed '
s/^.*[=-]//
s/"//g
s/[ #}\t].*$//g
')
# Step 1 - find the version expression # Step 1 - find the version expression
# This looks for the last instance of $OUTPUT. # This looks for the last instance of $OUTPUT.
@ -1111,18 +1102,9 @@ info_item() {
SHORTPATH=$REPO_DIR/$CATEGORY/$APP SHORTPATH=$REPO_DIR/$CATEGORY/$APP
CURVERSION=$(grep VERSION $SHORTPATH/$APP.info | CURVERSION=$(grep VERSION $SHORTPATH/$APP.info |
cut -d= -f2 | sed s/\"//g) cut -d= -f2 | sed s/\"//g)
CURARCH=$(egrep -m1 "^ARCH" $SHORTPATH/$APP.SlackBuild | sed ' eval CUR$(grep -m1 ^ARCH= $SHORTPATH/$APP.SlackBuild)
s/\([^\t #]*\)[\t #].*/\1/ eval CUR$(grep -m1 ^BUILD= $SHORTPATH/$APP.SlackBuild)
s/[^=]*=// [[ -z $CURARCH ]] && CURARCH=unknown
s/"//g
s/\${[^-]*-\(.*\)}/\1/
s/\$.*/unknown/
')
CURBUILD=$(egrep -m1 "^BUILD" $SHORTPATH/$APP.SlackBuild | sed '
s/^.*[=-]//
s/"//g
s/[ #}\t].*$//g
')
while :; do while :; do
INSTALLEDPACKAGE=$(ls /var/log/packages | INSTALLEDPACKAGE=$(ls /var/log/packages |
egrep "^($APP|$OLDPKG)-[^-]*-[^-]*-[^-]*\$") egrep "^($APP|$OLDPKG)-[^-]*-[^-]*-[^-]*\$")