[X2Go-Commits] [live-build-x2go] 108/167: tempdir preparation only needs to take place if we need to perform an update or if checking the timestamp failed. Also, indentation was wrong.

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:32:51 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 ea4d29454df55055c2a692b5aa18d19ec658d6e1
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jul 26 19:08:21 2017 +0200

    tempdir preparation only needs to take place if we need to perform an update or if checking the timestamp failed. Also, indentation was wrong.
---
 .../lib/live/config/2400-live-autoupdate           | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index f539b60..b707e30 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -298,16 +298,17 @@ echo -n " live-autoupdater (backgrounding update task)"
 		check_timestamp
 		CTRC=$?
 		if [ $CTRC -eq 1 ]; then
-				echo -n "\n$(date +'%F | %T | ')'$0': an error occurred during timestamp download; trying full download instead ..."
+			echo -n "\n$(date +'%F | %T | ')'$0': an error occurred during timestamp download; trying full download instead ..."
 		elif [ $CTRC -eq 5 ]; then
-				cleanup
-				echo -n "\n$(date +'%F | %T | ')'$0': Nothing to do. - Files on server not newer than '$RUNNINGSYSTEMNAME'."
-				echo -n "\n$(date +'%F | %T | ')'$0': ('$RUNNINGSYSTEMNAME' is Version $RUNNINGVERSION - $(date --date=@$RUNNINGVERSION))."
-				return 0 	# current is newest, nothing to do, we want to avoid
-						# unneccessary writes to the medium
+			cleanup
+			echo -n "\n$(date +'%F | %T | ')'$0': Nothing to do. - Files on server not newer than '$RUNNINGSYSTEMNAME'."
+			echo -n "\n$(date +'%F | %T | ')'$0': ('$RUNNINGSYSTEMNAME' is Version $RUNNINGVERSION - $(date --date=@$RUNNINGVERSION))."
+			return 0 	# current is newest, nothing to do, we want to avoid
+					# unneccessary writes to the medium
 		else
-			prepare_tempdir
+			: # NOP
 		fi
+		prepare_tempdir
 
 		# Attempt to determine available bandwidth & to set BWLIMIT accordingly
 		echo -n "\n$(date +'%F | %T | ')'$0': Attempting to determine available bandwidth for wget.\n"
@@ -353,15 +354,17 @@ echo -n " live-autoupdater (backgrounding update task)"
 		check_timestamp
 		CTRC=$?
 		if [ $CTRC -eq 1 ]; then
-				echo -n "\n$(date +'%F | %T | ')'$0': an error occurred during timestamp download; trying full download instead ..."
+			echo -n "\n$(date +'%F | %T | ')'$0': an error occurred during timestamp download; trying full download instead ..."
 		elif [ $CTRC -eq 5 ]; then
-				cleanup
-				echo -n "\n$(date +'%F | %T | ')'$0': Nothing to do. - Files on server not newer than '$RUNNINGSYSTEMNAME'."
-				echo -n "\n$(date +'%F | %T | ')'$0': ('$RUNNINGSYSTEMNAME' is Version $RUNNINGVERSION - $(date --date=@$RUNNINGVERSION))."
-				return 0 	# current is newest, nothing to do, we want to avoid
-						# unneccessary writes to the medium
+			cleanup
+			echo -n "\n$(date +'%F | %T | ')'$0': Nothing to do. - Files on server not newer than '$RUNNINGSYSTEMNAME'."
+			echo -n "\n$(date +'%F | %T | ')'$0': ('$RUNNINGSYSTEMNAME' is Version $RUNNINGVERSION - $(date --date=@$RUNNINGVERSION))."
+			return 0 	# current is newest, nothing to do, we want to avoid
+					# unneccessary writes to the medium
 		else
-			prepare_tempdir
+			: # NOP
+		fi
+		prepare_tempdir
 		fi
 
 

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