From 158b90be90cf78cc3c6a7e635f10721bab1f832a Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 27 Sep 2007 15:19:48 +0000 Subject: [PATCH] Umstellung der valid-download-URL auf die offizielle Variante (ist nur ein Redirect) das download-Skript ignoriert nun auskommentierte Zeilen in der URL-Listen-Datei --- downloads/get_files.sh | 10 +++++----- downloads/programme.lst | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/downloads/get_files.sh b/downloads/get_files.sh index 6af75e0..17523dd 100755 --- a/downloads/get_files.sh +++ b/downloads/get_files.sh @@ -71,14 +71,14 @@ ACTION=help case "$ACTION" in download ) - cut -f 1 "$URL_FILE" | while read a + grep -v "^#" "$URL_FILE" | cut -f 1 | while read a do [ ! -e "$DEST_DIR/$a" ] && download_file "$a" done # ExitCode auf Null setzen true ;; verify ) - cut -f 1 "$URL_FILE" | while read a + grep -v "^#" "$URL_FILE" | cut -f 1 | while read a do if verify_file "$a" then true else echo "Verification of '$a' failed ..." @@ -88,15 +88,15 @@ case "$ACTION" in ;; clean ) # Datei loeschen - cut -f 1 "$URL_FILE" | while read a; do rm -f "$DEST_DIR/$a"; done + grep -v "^#" "$URL_FILE" | cut -f 1 | while read a; do rm -f "$DEST_DIR/$a"; done # Signatur loeschen, falls vorhanden - cut -f 3 "$URL_FILE" | sed /^$/d | while read a; do rm -f "$DEST_DIR/$(basename $a)"; done + grep -v "^#" "$URL_FILE" | cut -f 3 | sed /^$/d | while read a; do rm -f "$DEST_DIR/$(basename $a)"; done ;; install ) [ $# -eq 0 ] && echo 'You need to specify the destination directory!' && exit 1 INST_DIR=$1 [ ! -e "$INST_DIR" ] && mkdir -p "$INST_DIR" - cut -f 1 "$URL_FILE" | while read a + grep -v "^#" "$URL_FILE" | cut -f 1 | while read a do [ -e "$DEST_DIR/$a" ] || download_file "$a" cp "$DEST_DIR/$a" "$INST_DIR/" done diff --git a/downloads/programme.lst b/downloads/programme.lst index 5d0a307..1c55eb3 100644 --- a/downloads/programme.lst +++ b/downloads/programme.lst @@ -8,7 +8,7 @@ shellopn.exe http://www.joachimschlosser.de/downloads/shellopn.exe shellopn.zip http://www.joachimschlosser.de/downloads/shellopn.zip pidgin-2.2.0.exe http://downloads.sourceforge.net/pidgin/pidgin-2.0.2.exe pidgin-encryption-3.0.exe http://mesh.dl.sourceforge.net/sourceforge/pidgin-encrypt/pidgin-encryption-3.0.exe -vidalia-bundle-0.1.2.17-0.0.14.exe http://vidalia-project.net:8001/vidalia/vidalia-bundle-0.1.2.17-0.0.14.exe http://vidalia-project.net:8001/vidalia/vidalia-bundle-0.1.2.17-0.0.14.exe.asc +vidalia-bundle-0.1.2.17-0.0.14.exe http://vidalia-project.net/dist/vidalia-bundle-0.1.2.17-0.0.14.exe http://vidalia-project.net/dist/vidalia-bundle-0.1.2.17-0.0.14.exe.asc Firefox Setup 2.0.0.7.exe http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/2.0.0.7/win32/de/Firefox%20Setup%202.0.0.7.exe http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/2.0.0.7/win32/de/Firefox%20Setup%202.0.0.7.exe.asc Firefox 2.0.0.7.dmg http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/2.0.0.7/mac/de/Firefox%202.0.0.7.dmg http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/2.0.0.7/mac/de/Firefox%202.0.0.7.dmg.asc -torbutton-1.0.4.01-fx+tb.xpi https://addons.mozilla.org/en-US/firefox/downloads/file/18459/torbutton-1.0.4.01-fx+tb.xpi \ No newline at end of file +torbutton-1.0.4.01-fx+tb.xpi https://addons.mozilla.org/en-US/firefox/downloads/file/18459/torbutton-1.0.4.01-fx+tb.xpi