[Lunar-commits] <moonbase> discover, discover-data: fix the download path.

[Florin Braescu]

commit 48c1789a28381d6ebc9ce4ed0ffb81814691bda3
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Jan 18 21:46:35 2009 +0200

    discover, discover-data: fix the download path.
---
 utils/discover-data/BUILD   |    2 +-
 utils/discover-data/DETAILS |    3 ++-
 utils/discover/BUILD        |   20 ++++++++++----------
 utils/discover/DETAILS      |    5 +++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/utils/discover-data/BUILD b/utils/discover-data/BUILD
index d6f1239..1f70244 100644
--- a/utils/discover-data/BUILD
+++ b/utils/discover-data/BUILD
@@ -1,6 +1,6 @@
 (
 
-  prepare_install &&
+  prepare_install  &&
   sedit "s:/usr/local:/usr:g" Makefile
   sedit "s:(datadir)/tools:(prefix)/bin:g" Makefile
   make install
diff --git a/utils/discover-data/DETAILS b/utils/discover-data/DETAILS
index e145e8f..a396676 100644
--- a/utils/discover-data/DETAILS
+++ b/utils/discover-data/DETAILS
@@ -1,12 +1,13 @@
           MODULE=discover-data
          VERSION=2.2008.08.01
           SOURCE=$MODULE-lunar-$VERSION.tar.gz
-      SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors/
+      SOURCE_URL=$MIRROR_URL
       SOURCE_VFY=sha1:d12831f428afd68cda5c8796b254f8591ad5bab8
         WEB_SITE=http://componentizedlinux.org/index.php/Discover
          ENTERED=20031129
          UPDATED=20080801
            SHORT="Hardware and driver database for the discover utility"
+
 cat << EOF
 This module contains the (ever growing) data needed for discover. It's
 a separate package since they expect more updates here to come, and
diff --git a/utils/discover/BUILD b/utils/discover/BUILD
index 2691994..481e95e 100644
--- a/utils/discover/BUILD
+++ b/utils/discover/BUILD
@@ -1,27 +1,27 @@
 (
   if ! in_depends discover docbook-4.1 ; then
     patch_it $SOURCE2 0
-  fi
+  fi  &&
 
   if module_installed docbook-utils; then
     sedit 's:${DOCBOOKTOMAN}:docbook2man:g' doctools/docbook.mk
   else
     sedit 's:docbook-to-man:echo:' doctools/docbook.mk
-  fi &&
+  fi  &&
 
   OPTS="$OPTS --disable-curl"
 
-  default_config &&
-  make &&
-  make check &&
-  prepare_install &&
+  default_config  &&
+  make  &&
+  make check  &&
+  prepare_install  &&
 
-  rm -f /usr/sbin/discover-modprobe &&
+  rm -f /usr/sbin/discover-modprobe  &&
 
-  make install &&
+  make install  &&
 
-  mv /usr/sbin/discover-modprobe /sbin/ &&
-  ln -sf /sbin/discover-modprobe /usr/sbin/discover-modprobe &&
+  mv /usr/sbin/discover-modprobe /sbin/  &&
+  ln -sf /sbin/discover-modprobe /usr/sbin/discover-modprobe  &&
   ln -sf ../init.d/discover /etc/rcS.d/S20discover
 
 ) > $C_FIFO 2>&1
diff --git a/utils/discover/DETAILS b/utils/discover/DETAILS
index 0bc1ba3..5673485 100644
--- a/utils/discover/DETAILS
+++ b/utils/discover/DETAILS
@@ -2,14 +2,15 @@
          VERSION=2.0.7
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-$VERSION-no-docbook.patch
-      SOURCE_URL=http://ftp.zresearch.com/pub/gluster/external/
-     SOURCE2_URL=$PATCH_URL/
+      SOURCE_URL=$MIRROR_URL
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:bd18ac1b93408b670e97fd163f25fb3c21b92952
      SOURCE2_VFY=sha1:508254fa9024ed6161ca7b24ee8a9ba5f2af0169
         WEB_SITE=http://componentizedlinux.org/index.php/Discover
          ENTERED=20031129
          UPDATED=20050315
            SHORT="A set of hardware recognition tools"
+
 cat <<EOF
 Discover is a set of libraries and utilities for gathering and
 reporting information about a system's hardware. It uses OS-specific