[arch-general] [PATCH] Ignore empty lines when grepping host's mirrorlist
Pierre Schmitz
pierre at archlinux.de
Sat Sep 11 14:36:11 EDT 2010
On Sat, 11 Sep 2010 01:46:48 +0300, Evangelos Foutras
<foutrelis at gmail.com> 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'
Please at least at me to CC next time or open a bug report. Otherwise
there is a chance I just miss those patches.
However, this mirror detections wasn't that great anyway. I am now
using pacman to get the used mirror:
http://projects.archlinux.org/devtools.git/commit/?id=db7a90ccd280a84bdbdef078ed766aa321ed317a
This should always work even if you specify your mirrors directly in
pacman.conf or include a mirrorlist with a different name.
--
Pierre Schmitz, https://users.archlinux.de/~pierre
More information about the arch-general
mailing list