From a9b7a587ff5f49bf35200f9c4e29062a78f73594 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 19 Aug 2003 16:42:31 +0000 Subject: [PATCH] moved the Download-Mirror file form src to Download/Mirror (so it does not get deleted during a Cleanup ...) (#46) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1125 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 4 +++- scripts/Download | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 66886b858..08fe4ae9c 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -9,9 +9,11 @@ - Sebastian Jaenicke: fxed nessus init script - removed /tmp mounting from system.init - fails with real filesystem - relaced some $( cd foo/bar ; ls ) with a direct $( ls foo/bar/ ) - - rmoved sanity check for libart since it does not need glib ... + - removed sanity check for libart since it does not need glib ... - more inteligent apply_patchfiles, converted linux packages to use patchfiles and so copy all patches (#105) + - moved the Download-Mirror file form src to Download/Mirror (so it does not + get deleted during a Cleanup ...) (#46) *) 2003-08-18 (2.0.0-camp - 2.0.0-rc1) diff --git a/scripts/Download b/scripts/Download index 691c610af..170ea0048 100755 --- a/scripts/Download +++ b/scripts/Download @@ -109,14 +109,14 @@ while [ $loop -eq 1 ] ; do echo echo "The option '-mirror none' is not supported anymore!" echo - echo "You may 'echo none > src/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 "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 exit 1; else - echo "$2" > src/Download-Mirror + echo "$2" > Download/Mirror options="$options -mirror $2" mirror="$2" fi @@ -208,16 +208,16 @@ cksum_chk() { # Autodetect best Mirror and safe url in $mirror # detect_mirror() { - if [ -f src/Download-Mirror ] ; then - mirror="`cat src/Download-Mirror`" + if [ -f Download/Mirror ] ; then + mirror="`cat Download/Mirror`" if [ -z "$mirror" -o "$mirror" = "none" ] ; then - echo "INFO: Found src/Download-Mirror: none" \ + echo "INFO: Found Download/Mirror: none" \ "(use the original download locations)" else - echo "INFO: Found cached mirror URL in src/Download-Mirror:" + echo "INFO: Found cached mirror URL in Download/Mirror:" echo "INFO: $mirror" fi - echo "INFO: To force a new mirror auto-detection, remove src/Download-Mirror." + echo "INFO: To force a new mirror auto-detection, remove Download/Mirror." else echo "INFO: Auto-detecting best mirror ..." eval "$(egrep '^(rockver)=' scripts/parse-config)" @@ -246,7 +246,7 @@ detect_mirror() { fi fi done < src/Download-Mirror-List - echo $mirror > src/Download-Mirror + echo $mirror > Download/Mirror echo "INFO: $result" fi }