Update of /cvsroot/apachetoolbox/Apachetoolbox/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5320
Modified Files:
functions.conf
Log Message:
Added a function to prompt users for a URL for a package if all other URLs tried automatically fail. This is designed as a stop-gap solution to the mirroring servers that stop mirroring.
Also, added support for Darwin ports on MacOS X.
Index: functions.conf
===================================================================
RCS file: /cvsroot/apachetoolbox/Apachetoolbox/etc/functions.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions.conf 8 Sep 2003 20:45:02 -0000 1.2
--- functions.conf 8 Sep 2005 16:41:14 -0000 1.3
***************
*** 18,21 ****
--- 18,22 ----
test -x /sw/bin/$2 && export "$1"="/sw/bin/$2"
test -x /opt/sfw/bin/$2 && export "$1"="/opt/sfw/bin/$2"
+ test -x /opt/local/bin/$2 && export "$1"="/opt/local/bin/$2"
# pipe the var passed to this function, that was used to make a var, into sh to test the existing external var *gasp*
***************
*** 297,301 ****
check_source()
{
! if [ ! -f $1 ];then
notice "$MENUFALSE" "$1 detection failed\n"
if [ "$JUSTDL" = "$TRUE" ]; then
--- 298,302 ----
check_source()
{
! if [ ! -f $1 ]; then
notice "$MENUFALSE" "$1 detection failed\n"
if [ "$JUSTDL" = "$TRUE" ]; then
***************
*** 306,310 ****
$WGET $WGETOPTIONS "http://www.apachetoolbox.com/data/cvs/src/`basename $2`"
fi
! if [ ! -f $1 ]; then echo "Error retreiving $1."; exit 1; fi
else
IsYNLoop "Do you wish to download it now? [all]"
--- 307,322 ----
$WGET $WGETOPTIONS "http://www.apachetoolbox.com/data/cvs/src/`basename $2`"
fi
!
! if [ ! -f $1 ]; then
! echo_line
! echo -e "Error retreiving $1.\n"
! echo -e "Please enter a URL for the file: "
! $WGET $WGETOPTIONS "$?"
! fi
!
! if [ ! -f $1 ]; then
! echo "Error retreiving $1."
! exit 1
! fi
else
IsYNLoop "Do you wish to download it now? [all]"
***************
*** 327,331 ****
fi
! if [ ! -f $1 ]; then
echo "Error retreiving $1."
exit 1
--- 339,350 ----
fi
! if [ ! -f $1 ]; then
! echo_line
! echo -e "Error retreiving $1.\n"
! echo -e "Please enter a URL for the file: "
! $WGET $WGETOPTIONS "$?"
! fi
!
! if [ ! -f $1 ]; then
echo "Error retreiving $1."
exit 1
|
