From 782518da1a948f8028c85586d49c7845f7bea89d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 10 May 2006 19:14:30 +0000 Subject: [PATCH] - allow comments and empty lines in mirrors file - fix unbalanced mirror resolving left and right Changed files: builder.sh -> 1.429 --- builder.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/builder.sh b/builder.sh index 66ae105..7c8a152 100644 --- a/builder.sh +++ b/builder.sh @@ -602,18 +602,22 @@ get_spec() find_mirror() { cd "$SPECS_DIR" - url="$1" + local url="$1" if [ ! -f "mirrors" -a "$NOCVSSPEC" != "yes" ] ; then cvs update mirrors >&2 fi IFS="|" - while read origin mirror name rest - do + local origin mirror name rest ol prefix + while read origin mirror name rest; do + # skip comments and empty lines + if [ -z "$origin" ] || [[ $origin == \#* ]]; then + continue + fi ol=`echo -n "$origin"|wc -c` prefix="`echo -n "$url" | head -c $ol`" if [ "$prefix" = "$origin" ] ; then - suffix="`echo "$url"|cut -b $ol-`" + suffix="`echo "$url"|cut -b $((ol+1))-`" echo -n "$mirror$suffix" return 0 fi -- 2.44.0