Merge remote branch 'remotes/elrond/misc/lazyserver_paste_local'

This commit is contained in:
Jef van Schendel 2011-10-29 16:13:39 -05:00 committed by Christopher Allan Webber
commit 42652ad1d5

View File

@ -18,13 +18,24 @@
if [ "$1" = "-h" ]
then
echo "$0 [-h] [-c paste.ini] ARGS_to_paster"
echo "$0 [-h] [-c paste.ini] [ARGS_to_paster ...]"
echo ""
echo " For example:"
echo " $0 -c fcgi.ini port_number=23371"
echo " $0 -c fcgi.ini port_number=23371"
echo " or: $0 --server-name=fcgi"
echo ""
echo " The configfile defaults to paste_local.ini,"
echo " if that is readable, otherwise paste.ini."
exit 1
fi
PASTE_INI=paste.ini
if [ -r paste_local.ini ]
then
PASTE_INI=paste_local.ini
fi
if [ "$1" = "-c" ]
then
PASTE_INI="$2"
@ -32,6 +43,8 @@ then
shift
fi
echo "Using paste config: $PASTE_INI"
if [ -f ./bin/paster ]; then
echo "Using ./bin/paster";
export PASTER="./bin/paster";