From b63eadb08c1d1b475f4fa201442055ec02f05a47 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 23 Oct 2011 23:54:00 +0200 Subject: [PATCH] lazyserver.sh: Try paste_local.ini before paste.ini If users have a paste_local.ini, use that one instead of the shipped paste.ini. That way local changes will not interfere with the main shipped config. Also improve the help string (./lazyserver.sh -h) a bit. --- lazyserver.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lazyserver.sh b/lazyserver.sh index e4afdaa5..63818a6a 100755 --- a/lazyserver.sh +++ b/lazyserver.sh @@ -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"; -- 2.25.1