[X2Go-Commits] [live-build-x2go] 136/166: wget param change had unintended side effects - log file was empty. rsync does not need the tee helper construct. Various spelling fixes in log output.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/mate-minidesktop
in repository live-build-x2go.

commit 1291b7d458819c1a366e7d113d8977f9d8d3570f
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Jul 25 14:17:36 2017 +0200

    wget param change had unintended side effects - log file was empty. rsync does not need the tee helper construct. Various spelling fixes in log output.
---
 config/includes.chroot/lib/live/config/2400-live-autoupdate | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index b5a56ec..bdf770c 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -273,8 +273,8 @@ echo -n " live-autoupdater (backgrounding update task)"
 	   then
 		# Attempt to determine available bandwidth & to set BWLIMIT accordingly
 		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 | \
+		wget -Nr -P /tmp/ -nd \
+			--progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img 2>&1 | \
 			tee /tmp/dl.log
 		cp --update "/tmp/x2go-tce-initrd.img" "$TEMPDIR"
 		rm "/tmp/x2go-tce-initrd.img"
@@ -284,7 +284,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 				   )
 		case $SIZEFACTORSTRING in
 			"" | \
-			[0-9]) 	echo -n "\n$(date +'%F | %T | ')'$0': Not enough Bandwidth for update task - "
+			[0-9]) 	echo -n "\n$(date +'%F | %T | ')'$0': Not enough bandwidth for update task - "
 				echo -n "aborting."
 				cleanup
 				return 0
@@ -311,9 +311,8 @@ echo -n " live-autoupdater (backgrounding update task)"
 
 		# Attempt to determine available bandwidth & to set BWLIMIT accordingly
 		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
+		rsync -hh -aPv -W --inplace --log-file=/tmp/dl.log $DOWNLOADURL/x2go-tce-initrd.img \
+			$TEMPDIR/x2go-tce-initrd.img.new
 		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" \
@@ -321,7 +320,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 				   )
 		case $SIZEFACTORSTRING in
 			"" | \
-			[0-9]) 	echo -n "\n$(date +'%F | %T | ')'$0': Not enough Bandwidth for update task - "
+			[0-9]) 	echo -n "\n$(date +'%F | %T | ')'$0': Not enough bandwidth for update task - "
 				echo -n "aborting."
 				cleanup
 				return 0

--
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