[X2Go-Commits] [live-build-x2go] 93/160: added code to check timestamp before download
git-admin at x2go.org
git-admin at x2go.org
Sat Nov 18 01:55:47 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 079a9626128acd54e91e5b0933660f1960bb7cd0
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Tue Jul 25 18:33:15 2017 +0200
added code to check timestamp before download
---
.../lib/live/config/2400-live-autoupdate | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index ae16e48..30187a0 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -312,6 +312,9 @@ echo -n " live-autoupdater (backgrounding update task)"
DOWNLOADCOMMAND="wget -Nr -l 1 -nd -P "$TEMPDIR" \
--progress=bar:force \
--limit-rate=${BWLIMIT}k $DOWNLOADURL"
+ DOWNLOADCOMMANDFORTIMESTAMP="wget -Nr -l 1 -nd -P "$TEMPDIR" \
+ --progress=bar:force \
+ --limit-rate=${BWLIMIT}k $DOWNLOADURL/x2go-tce-timestamp"
elif echo "$DOWNLOADURL" | grep -q "^rsync"; then
@@ -346,6 +349,8 @@ echo -n " live-autoupdater (backgrounding update task)"
echo -n "\n$(date +'%F | %T | ')'$0': Determined bandwidth limit: '$BWLIMIT KB/s'"
DOWNLOADCOMMAND="rsync -aPv --inplace --bwlimit=$BWLIMIT $DOWNLOADURL/ \
$TEMPDIR"
+ DOWNLOADCOMMANDFORTIMESTAMP="rsync -aPv --inplace --bwlimit=$BWLIMIT $DOWNLOADURL/x2go-tce-timestamp \
+ $TEMPDIR"
else
[ -n "$NTFSROOT" ] && umount $MOUNTPOINT
echo -n "\n$(date +'%F | %T | ')'$0': Unsupported download mechanism - aborting."
@@ -354,8 +359,23 @@ echo -n " live-autoupdater (backgrounding update task)"
rm /tmp/dl.log
+
# Proceed to download from update location
#
+ echo -n "\n$(date +'%F | %T | ')'$0': starting timestamp download ..."
+ if ! $DOWNLOADCOMMANDFORTIMESTAMP; then
+ echo -n "\n$(date +'%F | %T | ')'$0': an error occurred during timestamp download; trying full download instead ..."
+ else
+ RUNNINGVERSION=$(stat -c %Y /lib/live/mount/rootfs/filesystem.squashfs/lib)
+ if [ $RUNNINGVERSION) -ge $(cat $TEMPDIR/x2go-tce-timestamp) ] ; 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 $RUNNINGSYSTEMVERSION - $(date --date=@$RUNNINGSYSTEMVERSION))."
+ return 0 # current is newest, nothing to do, we want to avoid
+ # unneccessary writes to the medium
+ fi
+ fi
+
echo -n "\n$(date +'%F | %T | ')'$0': starting download ..."
while ! $DOWNLOADCOMMAND; do
echo -n "\n$(date +'%F | %T | ')'$0': an error occurred; sleeping 30 seconds ..."
--
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