[X2Go-Commits] [live-build-x2go] 83/167: mproved logging: bandwidth test should now output progress bar.
git-admin at x2go.org
git-admin at x2go.org
Sat Nov 18 00:32:46 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.
commit 464b89189d46ed3c577b744b5e10ac9ba3c5e431
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Tue Jul 25 10:49:21 2017 +0200
mproved logging: bandwidth test should now output progress bar.
---
.../includes.chroot/lib/live/config/2400-live-autoupdate | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index 8fdae01..7d6d4db 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -259,9 +259,10 @@ echo -n " live-autoupdater (backgrounding update task)"
echo "$DOWNLOADURL" | grep -q "^ftp"
then
# Attempt to determine available bandwidth & to set BWLIMIT accordingly
- echo -n "\n$(date +'%F | %T | ')'$0': Attempting to determine available bandwidth for wget."
- wget -Nr -o /tmp/dl.log -P /tmp/ -nd \
- --progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img
+ echo -n "\n$(date +'%F | %T | ')'$0': Attempting to determine available bandwidth for wget.\n"
+ wget -Nr -o - -P /tmp/ -nd \
+ --progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img | \
+ tee /tmp/dl.log
cp --update "/tmp/x2go-tce-initrd.img" "$TEMPDIR"
rm "/tmp/x2go-tce-initrd.img"
SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \
@@ -296,9 +297,10 @@ echo -n " live-autoupdater (backgrounding update task)"
elif echo "$DOWNLOADURL" | grep -q "^rsync"; then
# Attempt to determine available bandwidth & to set BWLIMIT accordingly
- echo -n "\n$(date +'%F | %T | ')'$0': Attempting to determine available bandwidth for rsync."
- rsync -hh -aPv -W --inplace --log-file=/tmp/dl.log $DOWNLOADURL/x2go-tce-initrd.img \
- $TEMPDIR/x2go-tce-initrd.img.new
+ echo -n "\n$(date +'%F | %T | ')'$0': Attempting to determine available bandwidth for rsync.\n"
+ rsync -hh -aPv -W --inplace --log-file=- $DOWNLOADURL/x2go-tce-initrd.img \
+ $TEMPDIR/x2go-tce-initrd.img.new | \
+ tee /tmp/dl.log
mv $TEMPDIR/x2go-tce-initrd.img.new $TEMPDIR/x2go-tce-initrd.img
SIZEFACTORSTRING=$( sed -e's_\(. bytes/sec\)_ \1_' /tmp/dl.log | \
awk '$4 == "sent" && $12 == "bytes/sec" \
--
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