X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-fedora-mirror.sh;h=2afeb2d68fb9c7d3e2e95db7e7d0cdbd9ce0d43d;hb=7979edfdab6bd3ff20208aa0e505456ff03ba5bc;hp=5ac8851f3fe60c2346ef7315a07d85c134d76beb;hpb=744f64509b88db1db138b7e3bfb1e5765734a474;p=build.git

diff --git a/vbuild-fedora-mirror.sh b/vbuild-fedora-mirror.sh
index 5ac8851f..2afeb2d6 100755
--- a/vbuild-fedora-mirror.sh
+++ b/vbuild-fedora-mirror.sh
@@ -10,12 +10,11 @@ LOG=${LOGDIR}/${DATE}.log
 dry_run=
 verbose=
 log=
-skip_core=
+skip_core=true
 root=/mirror/
 
 
-hozac_url=http://rpm.hozac.com/dhozac/centos/5/vserver
-# Daniel mentions rsync://rpm.hozac.com/dhozac/centos/5/vserver/
+dhozac_url=rsync://rpm.hozac.com/dhozac/centos/
 
 us_fedora_url=rsync://mirrors.kernel.org/fedora
 us_centos_url=rsync://mirrors.rit.edu/centos
@@ -27,18 +26,24 @@ eu_fedora_url=rsync://mirror.ovh.net/download.fedora.redhat.com/linux
 eu_centos_url=rsync://mirrors.ircam.fr/CentOS
 eu_epel_url=rsync://mirrors.ircam.fr/fedora-epel
 
+pl_fedora_url=$eu_fedora_url
+pl_centos_url=rsync://ftp.tpnet.pl/centos
+pl_epel_url=rsync://ftp.icm.edu.pl/pub/Linux/fedora/linux/epel
+
 jp_fedora_url="jp_fedora_url-needs-to-be-defined"
 jp_centos_url="jp_centos_url-needs-to-be-defined"
 jp_epel_url="jp_epel_url-needs-to-be-defined"
 
-default_distroname="centos5"
-all_distronames="f8 f10 f11 centos5.2 centos5.3 epel5"
+default_distroname="centos5.4"
+all_distronames="f10 f12 centos5.3 centos5.4 epel5"
 default_arch="i386"
 all_archs="i386 x86_64"
 
 case $(hostname) in 
     *.fr|*.de|*.uk)
 	fedora_url=$eu_fedora_url ; centos_url=$eu_centos_url ; epel_url=$eu_epel_url ;;
+    *.pl)
+	fedora_url=$pl_fedora_url ; centos_url=$pl_centos_url ; epel_url=$pl_epel_url ;;
     *.jp)
 	fedora_url=$jp_fedora_url ; centos_url=$jp_centos_url ; epel_url=$jp_epel_url ;;
     *)
@@ -49,8 +54,6 @@ function mirror_distro_arch () {
     distroname=$1; shift
     arch=$1; shift
 
-    LFTP=0
-
     distroname=$(echo $distroname | tr '[A-Z]' '[a-z]')
     case $distroname in
 	fc*[1-6])
@@ -73,10 +76,10 @@ function mirror_distro_arch () {
 	    distro=epel
 	    rsyncurl=$epel_url
 	    ;;
-	hozac)
+	dhozac)
 	    distroindex=5
-	    distro="hozac"
-	    rsyncurl=$hozac_url
+	    distro="dhozac"
+	    rsyncurl=$dhozac_url
 	    ;;
 	*)
 	    echo "WARNING -- Unknown distribution $distroname -- skipped"
@@ -86,11 +89,9 @@ function mirror_distro_arch () {
 
     excludelist="debug/ iso/ ppc/ source/"
     options="--archive --compress --delete --delete-excluded $dry_run $verbose"
-    lftp_options="--delete $dry_run $verbose"
     [ -n "$(rsync --help | grep no-motd)" ] && options="$options --no-motd"
     for e in $excludelist; do
 	options="$options --exclude $e"
-	lftp_options="$lftp_options --exclude $e"
     done
 
     echo ">>>>>>>>>>>>>>>>>>>> root=$root distroname=$distroname arch=$arch rsyncurl=$rsyncurl"
@@ -140,13 +141,12 @@ function mirror_distro_arch () {
 	    localpath=epel
 	    ;;
 
-	hozac*)
+	dhozac*)
 	    case $distroindex in
 		5)
 		    # leave off trailing '/'
-		    paths="$paths $arch"
+		    paths="$paths $distroindex/vserver/$arch"
 		    RES=0
-		    LFTP=1
 		    ;;
 	    esac
 	    localpath=dhozac
@@ -160,11 +160,7 @@ function mirror_distro_arch () {
 	for repopath in $paths; do
 	    echo "===== $distro -> $distroindex $repopath"
 	    [ -z "$dry_run" ] && mkdir -p ${root}/${localpath}/${repopath}
-	    if [ "$LFTP" = 1 ]; then
-	        command="lftp -c mirror $lftp_options ${rsyncurl}/${repopath} ${root}/${localpath}/${repopath}"
-	    else
-		command="rsync $options ${rsyncurl}/${repopath} ${root}/${localpath}/${repopath}"
-	    fi
+	    command="rsync $options ${rsyncurl}/${repopath} ${root}/${localpath}/${repopath}"
 	    echo $command
 	    $command
 	done
@@ -183,7 +179,8 @@ function usage () {
     echo " -n : dry run"
     echo " -v : verbose"
     echo " -l : turns on autologging in $LOGDIR"
-    echo " -c : skips core repository"
+    echo " -c : skips core repository (default)"
+    echo " -C : force syncing core repository"
     echo " -r root (default is $root)"
     echo " -u rsyncurl for fedora (default is $fedora_url)"
     echo " -U rsyncurl for centos (default is $centos_url)"
@@ -211,12 +208,13 @@ function run () {
 function main () {
     distronames=""
     archs=""
-    while getopts "nvlcr:u:U:E:sejf:Fa:Ah" opt ; do
+    while getopts "nvlcCr:u:U:E:sejf:Fa:Ah" opt ; do
 	case $opt in
 	    n) dry_run=--dry-run ;;
 	    v) verbose=--verbose ;;
 	    l) log=true ;;
 	    c) skip_core=true ;;
+	    C) skip_core= ;;
 	    r) root=$OPTARG ;;
 	    u) fedora_url=$OPTARG ;;
 	    U) centos_url=$OPTARG ;;
@@ -231,6 +229,8 @@ function main () {
 	    h|*) usage ;;
 	esac
     done
+    shift $(($OPTIND-1))
+    [[ -n "$@" ]] && usage
     [ -z "$distronames" ] && distronames=$default_distroname
     [ -z "$archs" ] && archs=$default_arch