[Astlinux-commits] SF.net SVN: astlinux:[7600] branches/1.0

[<abe...@us...>]

Revision: 7600
          http://sourceforge.net/p/astlinux/code/7600
Author:   abelbeck
Date:     2016-03-19 18:40:08 +0000 (Sat, 19 Mar 2016)
Log Message:
-----------
Use 'curl' instead of Busybox 'wget' for downloads with new download-file script. Automatically redirect to our HTTPS cloudfront.net mirror, for now

Modified Paths:
--------------
    branches/1.0/package/arnofw/reload-spamhaus-drop
    branches/1.0/package/asterisk/upgrade-asterisk-sounds
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image

Added Paths:
-----------
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file

Modified: branches/1.0/package/arnofw/reload-spamhaus-drop
===================================================================
--- branches/1.0/package/arnofw/reload-spamhaus-drop	2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/package/arnofw/reload-spamhaus-drop	2016-03-19 18:40:08 UTC (rev 7600)
@@ -39,7 +39,7 @@
 unset IFS
 for URL in $URLS; do
   rm -f $TMP_FILE
-  if ! wget -q -O $TMP_FILE $URL >/dev/null; then
+  if ! /usr/sbin/download-file "$TMP_FILE" "$URL"; then
     rm -f $TMP_DROP $TMP_FILE
     MESG="Retrieving Spamhaus DROP list failed for '$URL', no action."
     logger -s -t reload-spamhaus-drop -p kern.info "$MESG"

Modified: branches/1.0/package/asterisk/upgrade-asterisk-sounds
===================================================================
--- branches/1.0/package/asterisk/upgrade-asterisk-sounds	2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/package/asterisk/upgrade-asterisk-sounds	2016-03-19 18:40:08 UTC (rev 7600)
@@ -124,7 +124,7 @@
 
   FILE="$(get_url_filename $type $lang $codec)"
 
-  if ! wget -q -c -O /tmp/snd/$FILE.sha1 $SRC_URL/$FILE.sha1 >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/snd/$FILE.sha1" "$SRC_URL/$FILE.sha1"; then
     unmount_tmpfs_snd
     echo "SHA1 download failed for sound package \"$(get_sha1_filename "$type" "$lang" "$codec")\"."
     exit $RED
@@ -139,7 +139,7 @@
     exit $ORANGE
   fi
 
-  if ! wget -q -c -O /tmp/snd/$FILE $SRC_URL/$FILE >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/snd/$FILE" "$SRC_URL/$FILE"; then
     unmount_tmpfs_snd
     echo "Sounds download failed for sound package \"$(get_sha1_filename "$type" "$lang" "$codec")\"."
     exit $RED

Added: branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file	2016-03-19 18:40:08 UTC (rev 7600)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+file="$1"
+
+url="$2"
+
+redirect_url()
+{
+  local in_url="$1" out_url="$2" base_url
+
+  base_url="${url#$in_url}"
+  if [ "$url" != "$base_url" ]; then
+    url="$out_url$base_url"
+  fi
+}
+
+if [ -z "$file" -o -z "$url" ]; then
+  echo "Usage: download-file file url" >&2
+  exit 1
+fi
+
+## Redirect to AstLinux HTTPS mirror URL
+##
+redirect_url "http://mirror.astlinux.org/" "https://d7rzm9p7jly0z.cloudfront.net/"
+redirect_url "https://mirror.astlinux.org/" "https://d7rzm9p7jly0z.cloudfront.net/"
+
+curl -sSfL --globoff --retry 1 --connect-timeout 15 --max-time 1800 -o "$file" "$url" >/dev/null
+


Property changes on: branches/1.0/project/astlinux/target_skeleton/usr/sbin/download-file
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2016-03-19 18:40:08 UTC (rev 7600)
@@ -33,13 +33,13 @@
 
   mkdir /tmp/get-locale
 
-  if ! wget -q -c -O /tmp/get-locale/locale-archive.gz.sha1 $SRC_URL/$locale/locale-archive.gz.sha1 >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/get-locale/locale-archive.gz.sha1" "$SRC_URL/$locale/locale-archive.gz.sha1"; then
     rm -rf /tmp/get-locale/
     echo "SHA1 download failed for locale \"$locale\"."
     exit $RED
   fi
 
-  if ! wget -q -c -O /tmp/get-locale/locale-archive.gz $SRC_URL/$locale/locale-archive.gz >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/get-locale/locale-archive.gz" "$SRC_URL/$locale/locale-archive.gz"; then
     rm -rf /tmp/get-locale/
     echo "Download failed for locale \"$locale\"."
     exit $RED
@@ -77,7 +77,7 @@
 {
   mkdir /tmp/get-locale
 
-  if ! wget -q -c -O /tmp/get-locale/locales.txt $SRC_URL/locales.txt >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/get-locale/locales.txt" "$SRC_URL/locales.txt"; then
     rm -rf /tmp/get-locale/
     echo "Locale Listing download failed."
     exit $RED

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2016-03-19 18:40:08 UTC (rev 7600)
@@ -141,7 +141,7 @@
     exit $RED
   fi
 
-  if wget -q -c -O /tmp/runup_ver $SRC_URL/ver >/dev/null; then
+  if /usr/sbin/download-file "/tmp/runup_ver" "$SRC_URL/ver"; then
     VER=$(cat /tmp/runup_ver)
     rm -f /tmp/runup_ver
   else
@@ -185,14 +185,14 @@
     exit $RED
   fi
 
-  if ! wget -q -c -O /tmp/runup/$VER.tar.gz $SRC_URL/$VER.tar.gz >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/runup/$VER.tar.gz" "$SRC_URL/$VER.tar.gz"; then
     unmount_tmpfs_runup
     unmount_oldroot_cdrom
     echo "Firmware download failed."
     exit $RED
   fi
 
-  if ! wget -q -c -O /tmp/runup/$VER.tar.gz.sha1 $SRC_URL/$VER.tar.gz.sha1 >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/runup/$VER.tar.gz.sha1" "$SRC_URL/$VER.tar.gz.sha1"; then
     unmount_tmpfs_runup
     unmount_oldroot_cdrom
     echo "Firmware sha1sum download failed."

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2016-03-19 18:40:08 UTC (rev 7600)
@@ -67,7 +67,7 @@
   mkdir -p $BASE/TMP/dl
   mkdir -p $BASE/TMP/tar
 
-  if ! wget -q -c -O $BASE/TMP/dl/$PKG.$suffix.sha1 "$SRC_URL.sha1" >/dev/null; then
+  if ! /usr/sbin/download-file "$BASE/TMP/dl/$PKG.$suffix.sha1" "$SRC_URL.sha1"; then
     finish $RED "Package '$PKG' SHA1 download failed."
   fi
 
@@ -75,7 +75,7 @@
     finish $ORANGE "Package '$PKG' is already installed."
   fi
 
-  if ! wget -q -c -O $BASE/TMP/dl/$PKG.$suffix "$SRC_URL" >/dev/null; then
+  if ! /usr/sbin/download-file "$BASE/TMP/dl/$PKG.$suffix" "$SRC_URL"; then
     finish $RED "Package '$PKG' download failed."
   fi
 

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image	2016-03-18 23:28:36 UTC (rev 7599)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image	2016-03-19 18:40:08 UTC (rev 7600)
@@ -165,7 +165,7 @@
     exit $RED
   fi
 
-  if wget -q -c -O /tmp/up_ver $URL/ver >/dev/null; then
+  if /usr/sbin/download-file "/tmp/up_ver" "$URL/ver"; then
     VER=`cat /tmp/up_ver`
     rm -f /tmp/up_ver
   else
@@ -211,14 +211,14 @@
     exit $RED
   fi
 
-  if ! wget -q -c -O /tmp/up/$VER.tar.gz $URL/$VER.tar.gz >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/up/$VER.tar.gz" "$URL/$VER.tar.gz"; then
     unmount_tmpfs_up
     unmount_oldroot_cdrom
     echo "Firmware download failed."
     exit $RED
   fi
 
-  if ! wget -q -c -O /tmp/up/$VER.tar.gz.sha1 $URL/$VER.tar.gz.sha1 >/dev/null; then
+  if ! /usr/sbin/download-file "/tmp/up/$VER.tar.gz.sha1" "$URL/$VER.tar.gz.sha1"; then
     unmount_tmpfs_up
     unmount_oldroot_cdrom
     echo "Firmware sha1sum download failed."

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.