From 29b3eadb3a10bb8332ee1ae8a38c1dac7a7e3c5e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 19 Oct 2011 08:28:57 +0200
Subject: [PATCH] autoupdate: use our own useragent and system id for
 downloading updates

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/tools/autoupdate/scripts/autoupdate.devel   | 10 ++++++----
 packages/tools/autoupdate/scripts/autoupdate.release |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/tools/autoupdate/scripts/autoupdate.devel b/packages/tools/autoupdate/scripts/autoupdate.devel
index 4642419fa2..e6a67dd39c 100755
--- a/packages/tools/autoupdate/scripts/autoupdate.devel
+++ b/packages/tools/autoupdate/scripts/autoupdate.devel
@@ -43,7 +43,9 @@ fi
 download () {
   case "$DL_METHOD" in
     wget)
-      wget -c $1 -P $TMP_DIR > /dev/null 2>&1
+      wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
+           -c ${1}?sysid=$SYSTEMID \
+           -O $2 > /dev/null 2>&1
       ;;
     scp)
       scp $SCP_ARG "$1" $TMP_DIR
@@ -69,7 +71,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
   # get infofile with the latest released version
     rm -rf $TMP_DIR/latest
-    download "$UPDATEURL/latest"
+    download "$UPDATEURL/latest" "$TMP_DIR/latest"
 
     NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`"
@@ -79,7 +81,7 @@ if [ ! -f /var/lock/update.lock ]; then
   # compare installed version with latest released version
     THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
 
-    if [ -Z $NEW_VERSION ]; then
+    if [ -z $NEW_VERSION ]; then
       NEW_VERSION="$THIS_VERSION"
     fi
 
@@ -100,7 +102,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
       # downloading the new version
         rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
-        download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
+        download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2"
 
       # extract the image
         rm -rf $TMP_DIR/$NEW_IMAGE
diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release
index 40744df76e..1011c63f9a 100755
--- a/packages/tools/autoupdate/scripts/autoupdate.release
+++ b/packages/tools/autoupdate/scripts/autoupdate.release
@@ -43,7 +43,9 @@ fi
 download () {
   case "$DL_METHOD" in
     wget)
-      wget -c $1 -P $TMP_DIR > /dev/null 2>&1
+      wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
+           -c ${1}?sysid=$SYSTEMID \
+           -O $2 > /dev/null 2>&1
       ;;
     scp)
       scp $SCP_ARG "$1" $TMP_DIR
@@ -72,7 +74,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
   # get infofile with the latest released version
     rm -rf $TMP_DIR/latest
-    download "$UPDATEURL/latest"
+    download "$UPDATEURL/latest" "$TMP_DIR/latest"
 
     NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`"
@@ -116,7 +118,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
     # downloading the new version
       rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
-      download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
+      download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2"
 
     # extract the image
       rm -rf $TMP_DIR/$NEW_IMAGE