Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making CONFIGS check less strict 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1965 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Joakim Erdfelt 2010-06-09 23:20:21 +00:00
parent be468d5f4b
commit 949ccb5598
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-distribution/src/main/resources/bin/jetty.sh
View File

@ -270,14 +270,7 @@ then
continue continue
fi fi
if [ ! -r "$CONF" ] if [ -d "$CONF" ]
then
echo "** WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
elif [ -f "$CONF" ]
then
# assume it's a configure.xml file
CONFIGS+=("$CONF")
elif [ -d "$CONF" ]
then then
# assume it's a directory with configure.xml files # assume it's a directory with configure.xml files
# for example: /etc/jetty.d/ # for example: /etc/jetty.d/
@ -292,7 +285,8 @@ then
fi fi
done done
else else
echo "** WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'" # assume it's a command line parameter (let start.jar deal with its validity)
CONFIGS+=("$CONF")
fi fi
done < "$JETTY_CONF" done < "$JETTY_CONF"
fi fi