* newinstall.sh: Be more careful about locating make/gmake on the host

  system.  Also now tries to use curl if wget is not available.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1deed170ebeef50fbfaf88ab18558d0ba8ccb7db..79e570c92edd0b8ce1399014d6ed41c6f4da7da9 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 626.14  2004/10/22 14:49:25  ajc
+ * newinstall.sh: Be more careful about locating make/gmake on the host
+   system.  Also now tries to use curl if wget is not available.
+
  Revision 626.13  2004/10/22 02:53:25  ajc
  * serv_notes.c: added skeleton module
  * serv_newuser.c: corrected internal comment
@@ -6168,3 +6172,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/newinstall.sh b/citadel/newinstall.sh
index 78e3e97b7393c76e2ce40d417e2f6d2fdad566d9..d8fed66010681c46baca6b8fbfbd20f4228db532 100644 (file)
--- a/citadel/newinstall.sh
+++ b/citadel/newinstall.sh
@@ -156,15 +156,15 @@ determine_distribution () {
 
 download_sources () {
        echo "* Downloading Berkeley DB..."
-       wget -c $DOWNLOAD_SITE/$DB_SOURCE 2>&1 >>$LOG || die
+       $WGET $DOWNLOAD_SITE/$DB_SOURCE 2>&1 >>$LOG || die
        echo "* Downloading libical..."
-       wget -c $DOWNLOAD_SITE/$ICAL_SOURCE 2>&1 >>$LOG || die
+       $WGET $DOWNLOAD_SITE/$ICAL_SOURCE 2>&1 >>$LOG || die
        echo "* Downloading OpenLDAP..."
-       wget -c $DOWNLOAD_SITE/$LDAP_SOURCE 2>&1 >>$LOG || die
+       $WGET $DOWNLOAD_SITE/$LDAP_SOURCE 2>&1 >>$LOG || die
        echo "* Downloading Citadel..."
-       wget -c $DOWNLOAD_SITE/$CITADEL_SOURCE 2>&1 >>$LOG || die
+       $WGET $DOWNLOAD_SITE/$CITADEL_SOURCE 2>&1 >>$LOG || die
        echo "* Downloading WebCit..."
-       wget -c $DOWNLOAD_SITE/$WEBCIT_SOURCE 2>&1 >>$LOG || die
+       $WGET $DOWNLOAD_SITE/$WEBCIT_SOURCE 2>&1 >>$LOG || die
 }
 
 install_ical () {
@@ -300,12 +300,18 @@ do_config () {
 
 # 1. Gather information about the target system
 
-[ -n $MAKE ] && MAKE=`which gmake`
-[ -z $MAKE ] && MAKE=`which make`
+[ -n "$MAKE" ] && [ -x `which gmake` ] && MAKE=`which gmake`
+[ -z "$MAKE" ] && [ -x `which make` ] && MAKE=`which make`
 clear
 
 os=`uname`
 
+[ -n "$WGET" ] && [ -x `which wget` ] && WGET=`which wget`
+[ -z "$WGET" ] && [ -x `which curl` ] && WGET=`which curl`\ -O
+
+echo MAKE is $MAKE
+echo WGET is $WGET 
+
 # 1A. Do we use the native packaging system or build our own copy of Citadel?
 
 if [ "$os" = "Linux" ]; then
@@ -313,6 +319,9 @@ if [ "$os" = "Linux" ]; then
 elif [ "$os" = "FreeBSD" ]; then
        # TODO: We detect FreeBSD but the port is still out of date...
        DISTRO_MAJOR=FreeBSD
+elif [ "$os" = "Darwin" ]; then
+       # TODO: Deal with Apple weirdness
+       DISTRO_MAJOR=Darwin
 fi