cleanup

[build.git] / vbuild-fedora-mirror.sh

diff --git a/vbuild-fedora-mirror.sh b/vbuild-fedora-mirror.sh
index 716b9f3..9f1e0db 100755 (executable)
--- a/vbuild-fedora-mirror.sh
+++ b/vbuild-fedora-mirror.sh
@@ -30,13 +30,9 @@ 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.6"
-all_distronames="f14 f16 centos5.6 epel5 epel6"
-default_arch="i386"
+default_distroname="f18"
+all_distronames="f18 f20"
+default_arch="x86_64"
 all_archs="i386 x86_64"
 
 case $(hostname) in 
@@ -61,7 +57,7 @@ function mirror_distro_arch () {
            distro="Fedora Core"
            rsyncurl=$fedora_url
            ;;
-       f*[7-9]|f1?)
+       f*[7-9]|f[12]?)
            distroindex=$(echo $distroname | sed -e "s,f,,g")
            distro="Fedora"
            rsyncurl=$fedora_url
@@ -107,7 +103,7 @@ function mirror_distro_arch () {
                    paths="$paths core/updates/$distroindex/$arch/ extras/$distroindex/$arch/"
                    RES=0
                    ;;
-               7|8|9|1?)
+               7|8|9|1?|2?)
                    [ -z "$skip_core" ] && paths="releases/$distroindex/Everything/$arch/os/"
                    paths="$paths updates/$distroindex/$arch/"
                    # f8 and f9 have the additional newkey repo
@@ -187,7 +183,6 @@ function usage () {
     echo " -E rsyncurl for epel (default is $epel_url)"
     echo " -s : uses standard (US) mirrors $us_fedora_url $us_centos_url $us_epel_url"
     echo " -e : uses European mirrors $eu_fedora_url $eu_centos_url $eu_epel_url"
-    echo " -j : uses Japanese mirrors $jp_fedora_url $jp_centos_url $jp_epel_url"
     echo " -f distroname - use vserver convention, e.g. f8 or centos5"
     echo " -F : for distroname in $all_distronames"
     echo " -a arch - use yum convention"
@@ -208,7 +203,7 @@ function run () {
 function main () {
     distronames=""
     archs=""
-    while getopts "nvlcCr:u:U:E:sejf:Fa:Ah" opt ; do
+    while getopts "nvlcCr:u:U:E:sef:Fa:Ah" opt ; do
        case $opt in
            n) dry_run=--dry-run ;;
            v) verbose=--verbose ;;
@@ -221,7 +216,6 @@ function main () {
            E) epel_url=$OPTARG ;;
            s) fedora_url=$us_fedora_url ; centos_url=$us_centos_url ; epel_url=$us_epel_url;;
            e) fedora_url=$eu_fedora_url ; centos_url=$eu_centos_url ; epel_url=$eu_epel_url ;;
-           j) fedora_url=$jp_fedora_url ; centos_url=$jp_centos_url ; epel_url=$jp_epel_url ;;
            f) distronames="$distronames $OPTARG" ;;
            F) distronames="$distronames $all_distronames" ;;
            a) archs="$archs $OPTARG" ;;