From 3c55a3d934e18f4df88120c40ae7ffeb1e60d4c5 Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@gmail.com>
Date: Thu, 9 Jun 2011 20:17:53 +0000
Subject: [PATCH] Update build script to build v1.6.0. Fix error message when
 no tool is found to download from a URL.

Subversion-branch: /buildscripts
Subversion-revision: 2345
---
 build-chocolate-doom | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/build-chocolate-doom b/build-chocolate-doom
index 0c816e7..6d8a709 100644
--- a/build-chocolate-doom
+++ b/build-chocolate-doom
@@ -56,8 +56,19 @@ get_url() {
         return
     fi
 
-    echo No tool available to retrieve URLs.  Please install curl or wget. >2
-    exit
+    # Desperate?
+
+    for l in lynx links elinks; do
+        if have_tool $l; then
+            echo "Using $l to download $url..." >&2
+            $l -source $url
+            return
+        fi
+    done
+
+    echo "No tool available to retrieve URLs.  Please install curl or wget." >&2
+
+    exit -1
 }
 
 # Extract a tar.gz file.
@@ -308,9 +319,9 @@ if $svn_build; then
 
     build_module chocolate-doom-svn ""
 else
-    # Build v1.5.0
+    # Build v1.6.0
 
-    fetch_and_build_module http://mesh.dl.sourceforge.net/project/chocolate-doom/chocolate-doom/1.5.0/ chocolate-doom 1.5.0 ""
+    fetch_and_build_module http://mesh.dl.sourceforge.net/project/chocolate-doom/chocolate-doom/1.6.0/ chocolate-doom 1.6.0 ""
 fi
 
 cd $CHOCOLATE_DOOM_DIR