|
@ -109,14 +109,14 @@ while [ $loop -eq 1 ] ; do |
|
|
echo |
|
|
echo |
|
|
echo "The option '-mirror none' is not supported anymore!" |
|
|
echo "The option '-mirror none' is not supported anymore!" |
|
|
echo |
|
|
echo |
|
|
echo "You may 'echo none > Download/Mirror' if you really" |
|
|
|
|
|
|
|
|
echo "You may 'echo none > download/Mirror' if you really" |
|
|
echo "want to use the original download resources. However, this" |
|
|
echo "want to use the original download resources. However, this" |
|
|
echo "is not supported and if such a download fails, this is not" |
|
|
echo "is not supported and if such a download fails, this is not" |
|
|
echo "a bug in ROCK Linux and doesn't neccessarily needs fixing." |
|
|
echo "a bug in ROCK Linux and doesn't neccessarily needs fixing." |
|
|
echo |
|
|
echo |
|
|
exit 1; |
|
|
exit 1; |
|
|
else |
|
|
else |
|
|
echo "$2" > Download/Mirror |
|
|
|
|
|
|
|
|
echo "$2" > download/Mirror |
|
|
options="$options -mirror $2" |
|
|
options="$options -mirror $2" |
|
|
mirror="$2" |
|
|
mirror="$2" |
|
|
fi |
|
|
fi |
|
@ -208,16 +208,16 @@ cksum_chk() { |
|
|
# Autodetect best Mirror and safe url in $mirror |
|
|
# Autodetect best Mirror and safe url in $mirror |
|
|
# |
|
|
# |
|
|
detect_mirror() { |
|
|
detect_mirror() { |
|
|
if [ -f Download/Mirror ] ; then |
|
|
|
|
|
mirror="`cat Download/Mirror`" |
|
|
|
|
|
|
|
|
if [ -f download/Mirror ] ; then |
|
|
|
|
|
mirror="`cat download/Mirror`" |
|
|
if [ -z "$mirror" -o "$mirror" = "none" ] ; then |
|
|
if [ -z "$mirror" -o "$mirror" = "none" ] ; then |
|
|
echo "INFO: Found Download/Mirror: none" \ |
|
|
|
|
|
|
|
|
echo "INFO: Found download/Mirror: none" \ |
|
|
"(use the original download locations)" |
|
|
"(use the original download locations)" |
|
|
else |
|
|
else |
|
|
echo "INFO: Found cached mirror URL in Download/Mirror:" |
|
|
|
|
|
|
|
|
echo "INFO: Found cached mirror URL in download/Mirror:" |
|
|
echo "INFO: $mirror" |
|
|
echo "INFO: $mirror" |
|
|
fi |
|
|
fi |
|
|
echo "INFO: To force a new mirror auto-detection, remove Download/Mirror." |
|
|
|
|
|
|
|
|
echo "INFO: To force a new mirror auto-detection, remove download/Mirror." |
|
|
else |
|
|
else |
|
|
echo "INFO: Auto-detecting best mirror ..." |
|
|
echo "INFO: Auto-detecting best mirror ..." |
|
|
eval "$(egrep '^(rockver)=' scripts/parse-config)" |
|
|
eval "$(egrep '^(rockver)=' scripts/parse-config)" |
|
@ -246,7 +246,7 @@ detect_mirror() { |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
done < src/Download-Mirror-List |
|
|
done < src/Download-Mirror-List |
|
|
echo $mirror > Download/Mirror |
|
|
|
|
|
|
|
|
echo $mirror > download/Mirror |
|
|
echo "INFO: $result" |
|
|
echo "INFO: $result" |
|
|
fi |
|
|
fi |
|
|
} |
|
|
} |
|
|