From d8054d867254f9b2dff31f797781187ade40a569 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 14 Jul 2014 23:10:27 +0200 Subject: [PATCH] autoupdater: try URL ${BRANCH}.manifest before manifest This will allow storing different manifests for multiple branches in a single directory. --- admin/autoupdater/files/usr/sbin/autoupdater | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/autoupdater/files/usr/sbin/autoupdater b/admin/autoupdater/files/usr/sbin/autoupdater index 0919f5f..7bb4ccc 100755 --- a/admin/autoupdater/files/usr/sbin/autoupdater +++ b/admin/autoupdater/files/usr/sbin/autoupdater @@ -35,13 +35,13 @@ newer_than() { } fetch_manifest() { - local MIRROR=$1 + local mirror=$1 local manifest=$2 - wget -O$manifest "$MIRROR"/manifest + wget -O$manifest "${mirror}/${BRANCH}.manifest" || wget -O$manifest "${mirror}/manifest" if test $? -ne 0; then - echo "Couldn't fetch manifest from $MIRROR" >&2 + echo "Couldn't fetch manifest from $mirror" >&2 return 1 fi