X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mirroring%2Fmirror.sh;h=95778da2c765586e43907fc6e5f62fc0c85ae77d;hb=cc5a9338d1528a7fec60f496bfba7b8b28a80539;hp=6e46484c855f77466e27d85c8382ec1a7efeb693;hpb=55c6b657a5e6c73463b37baf5e7c3a98ecec1605;p=build.git

diff --git a/mirroring/mirror.sh b/mirroring/mirror.sh
index 6e46484c..95778da2 100755
--- a/mirroring/mirror.sh
+++ b/mirroring/mirror.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
-# $Id$
 
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 
 default_url="http://localhost/mirror/"
-default_distro="f8"
-all_distros="fc4 fc6 f7 f8 centos5"
+default_distro="f14"
+all_distros="f12 f14 f16 f18 f20"
 
 function check_distro () {
     local distro=$1; shift
@@ -19,7 +18,7 @@ function check_distro () {
 
 function do_repo () {
     local distro=$1; shift
-    sedargs="-e s,@MIRRORURL@,$URL,"
+    sedargs="-e s,@MIRRORURL@,$URL,g"
     [ -n "$GPGOFF" ] && sedargs="$sedargs -e "'s,gpgcheck\W*=\W*1,gpgcheck=0,'
     sed $sedargs $DIRNAME/$distro/yum.repos.d/building.repo.in
 }
@@ -30,7 +29,7 @@ function do_init () {
     dir=/etc/vservers/.distributions/$distro/yum.repos.d/
     if [ ! -d $dir ] ; then
 	[ -n "$VERBOSE" ] && echo Creating dir $dir
-	mkdir -p -d $dir
+	mkdir -p $dir
     fi
     [ -n "$VERBOSE" ] && echo "Creating $repo"
     do_repo $distro > $repo
@@ -55,7 +54,7 @@ function do_display () {
     dir=/etc/vservers/.distributions/$distro/yum.repos.d/
     if [ -d $dir ] ; then
 	echo "====================" Contents of $dir
-	find $dir -name '*.repo' | xargs head --verbose --lines=1000
+	ls $dir/*.repo 2> /dev/null | xargs head --verbose --lines=1000
     else
 	echo "====================" $dir does not exist
     fi
@@ -79,14 +78,14 @@ function usage () {
     echo "Usage $COMMAND [options] <command>"
     echo "  a help to manage the yum.repos.d template in /etc/vservers/.distributions/<distro>"
     echo "Available commands"
-    echo "  display: shows content (default if missing)"
-    echo "  init: creates /etc/vservers/.distributions/<distro>/yum.repos.d/building.repo"
-    echo "       default is to use mirror root at $default_url"
-    echo "       use -u URL to specify another location"
+    echo "  display: shows content (default if <command> is missing)"
     echo "  diff: shows diff between current and what init would do"
+    echo "  init: creates /etc/vservers/.distributions/<distro>/yum.repos.d/building.repo"
     echo "  clean: removes building.repo"
     echo "  superclean: removes yum.repos.d altogether"
     echo "Options"
+    echo "  -u URL to specify another location"
+    echo "     default is to use mirror root at $default_url"
     echo "  -f <distro> : defaults to $default_distro"
     echo "  -a : runs on all distros $all_distros"
     echo "  -0 : turns off gpgcheck"
@@ -94,7 +93,7 @@ function usage () {
     echo "Examples"
     echo "  $COMMAND -a display "
     echo "  $COMMAND -a superclean"
-    echo "  $COMMAND -a -u http://mirror.one-lab.org/ init"
+    echo "  $COMMAND -a -u http://mirror.onelab.eu/ init"
     echo "  $COMMAND -a display"
     exit 1
 }