[arch-general] [PATCH] Ignore empty lines when grepping host's mirrorlist

[Dave Reisner]

On Sat, Sep 11, 2010 at 02:55:40AM +0300, Evangelos Foutras wrote:
> On Sat, Sep 11, 2010 at 1:59 AM, Dave Reisner <d at falconindy.com> wrote:
> > On Sat, Sep 11, 2010 at 01:46:48AM +0300, Evangelos Foutras wrote:
> >> ---
> >>  mkarchroot |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/mkarchroot b/mkarchroot
> >> index fe436f7..5cb9a0f 100755
> >> --- a/mkarchroot
> >> +++ b/mkarchroot
> >> @@ -73,7 +73,7 @@ if [ -z "$cache_dir" ]; then
> >>  fi
> >>
> >>  if [ -f /etc/pacman.d/mirrorlist ]; then
> >> -     host_mirror=$(grep -v '^#' -m1 /etc/pacman.d/mirrorlist | sed -E 's#/os/(i686|x86_64)#/os/\$arch#g')
> >> +     host_mirror=$(grep -E -v '^(#|$)' -m1 /etc/pacman.d/mirrorlist | sed -E 's#/os/(i686|x86_64)#/os/\$arch#g')
> >>  fi
> >>  if [ -z "${host_mirror}" ]; then
> >>       host_mirror='Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch'
> >> --
> >> 1.7.2.3
> >>
> >
> > Keep in mind this will still catch a line that only has spaces in it. I
> > would suggest using the pattern '^[\t ]*(#|$)' instead to avoid this.
> >
> > d
> 
> Now that I think about it, maybe it would be best to just grep for
> '^Server' instead of discarding irrelevant lines. :p

Even better! Well played.

d