Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2025-01-28 19:58:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

add :force to sbopkg.conf WGETFLAGS after --progress=bar to correctly display the progress bar; thanks to happyslacker for the reminder.

Browse source
This commit is contained in:
chess.griffin 2009-09-09 13:38:59 +00:00
parent 8dbba9f417
commit b132e73ccd
3 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog-current.txt
View file

@ -4,4 +4,7 @@ enhancements:
* Fix typo in 50-default renames file. * Fix typo in 50-default renames file.
* Add $ARCH information in dialog backtitles. * Add $ARCH information in dialog backtitles.
* Add ":force" to sbopkg.conf WGETFLAGS --progress=bar to correctly
display the wget progress bar; thanks to happyslacker for nudging me on
this issue again.
+--------------------------+ +--------------------------+

2
src/etc/sbopkg/sbopkg.conf.new
View file

@ -32,6 +32,6 @@ export OUTPUT=${OUTPUT:-/tmp}
# uses the -O options so there is no need to add that either. In general, # uses the -O options so there is no need to add that either. In general,
# it is not recommended that users change these default values. # it is not recommended that users change these default values.
RSYNCFLAGS="--verbose --timeout=10" RSYNCFLAGS="--verbose --timeout=10"
WGETFLAGS="--continue --progress=bar --timeout=15 --tries=5" WGETFLAGS="--continue --progress=bar:force --timeout=15 --tries=5"
DIFF=${DIFF:-diff} DIFF=${DIFF:-diff}
DIFFOPTS=${DIFFOPTS:--u} DIFFOPTS=${DIFFOPTS:--u}

28
src/usr/sbin/sbopkg
View file

@ -645,18 +645,8 @@ 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 $(echo -n NEW; grep -m1 ^ARCH= $NEWSB)
s/\([^\t #]*\)[\t #].*/\1/ eval $(echo -n NEW; grep -m1 ^BUILD= $NEWSB)
s/[^=]*=//
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.
@ -1058,18 +1048,8 @@ 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 $(echo -n CUR; grep -m1 ^ARCH= $SHORTPATH/$APP.SlackBuild)
s/\([^\t #]*\)[\t #].*/\1/ eval $(echo -n CUR; grep -m1 ^BUILD= $SHORTPATH/$APP.SlackBuild)
s/[^=]*=//
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)-[^-]*-[^-]*-[^-]*\$")