git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
f.. make
[build.git]
/
vbuild-fedora-mirror.sh
diff --git
a/vbuild-fedora-mirror.sh
b/vbuild-fedora-mirror.sh
index
14d9be7
..
1980d0a
100755
(executable)
--- a/
vbuild-fedora-mirror.sh
+++ b/
vbuild-fedora-mirror.sh
@@
-30,12
+30,8
@@
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
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.5"
-all_distronames="f13 f12 centos5.4 centos5.5 epel5"
+default_distroname="f16"
+all_distronames="f16 f18"
default_arch="i386"
all_archs="i386 x86_64"
default_arch="i386"
all_archs="i386 x86_64"
@@
-71,8
+67,8
@@
function mirror_distro_arch () {
distro="CentOS"
rsyncurl=$centos_url
;;
distro="CentOS"
rsyncurl=$centos_url
;;
- epel
5
)
- distroindex=
5
+ epel
[5-6]
)
+ distroindex=
$(echo $distroname | sed -e "s,epel,,g")
distro=epel
rsyncurl=$epel_url
;;
distro=epel
rsyncurl=$epel_url
;;
@@
-133,7
+129,7
@@
function mirror_distro_arch () {
epel*)
case $distroindex in
epel*)
case $distroindex in
- 5)
+ 5
|6
)
paths="$paths $distroindex/$arch/"
RES=0
;;
paths="$paths $distroindex/$arch/"
RES=0
;;
@@
-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 " -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"
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=""
function main () {
distronames=""
archs=""
- while getopts "nvlcCr:u:U:E:se
j
f: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 ;;
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 ;;
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" ;;
f) distronames="$distronames $OPTARG" ;;
F) distronames="$distronames $all_distronames" ;;
a) archs="$archs $OPTARG" ;;