[X2Go-Commits] [live-build-x2go] 52/58: wget output is different for ftp, changes to SIZEFACTORSTRING and DLRATE required
git-admin at x2go.org
git-admin at x2go.org
Tue Feb 14 09:34:14 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.
commit ac2ebc4020e5fd92f6e4ebfcfdaffed5d077afdd
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Sat Jan 14 00:50:41 2017 +0100
wget output is different for ftp, changes to SIZEFACTORSTRING and DLRATE required
---
.../lib/live/config/2300-live-autoupdate | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate
index 587a4c8..9e6a310 100755
--- a/config/includes.chroot/lib/live/config/2300-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate
@@ -205,7 +205,8 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \
cp --update "/tmp/x2go-tce-initrd.img" "$TEMPDIR"
rm "/tmp/x2go-tce-initrd.img"
SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \
- $7 == "-" { print $5 }' /tmp/dl.log \
+ $7 == "-" { print $5 }' /tmp/dl.log | \
+ tail -1 \
)
case $SIZEFACTORSTRING in
"" | \
@@ -220,7 +221,8 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \
*) SIZEFACTOR=$((1024*1024*1024));;
esac
DLRATE=$( awk -F' |\(|\)' ' $9 == "saved" && $7 == "-" \
- { print $4 }' /tmp/dl.log \
+ { print $4 }' /tmp/dl.log | \
+ tail -1
)
BWLIMIT=$( echo "$DLRATE $SIZEFACTOR $BWLIMITPERCENT" | \
awk ' { print $1*$2*$3/100 }' | \
--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list