Fix gerrit2.sh launch script classpath
When I refactored how the devdb classpath is handled (to use Maven instead of a hand-coded path) that messed up how the launch script used that directory to start the database. Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
@@ -54,26 +54,17 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ $# = 0 ]
|
if [ -z "$config_dir" ] || [ $# = 0 ]
|
||||||
then
|
then
|
||||||
echo >&2 "usage: $0 [--config=gs.prop] AppName [args]"
|
echo >&2 "usage: $0 --config=gs.prop AppName [args]"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
app=$1
|
app=$1
|
||||||
shift
|
shift
|
||||||
|
|
||||||
if [ -n "$config_dir" ]
|
CLASSPATH=$config_dir
|
||||||
then
|
for j in $GERRIT2_HOME/lib/*.jar $GERRIT2_HOME/jdbc/*.jar
|
||||||
CLASSPATH=$config_dir
|
|
||||||
for j in $config_dir/jdbc-*.jar
|
|
||||||
do
|
|
||||||
[ -f "$j" ] && CLASSPATH=$CLASSPATH:$j
|
|
||||||
done
|
|
||||||
else
|
|
||||||
CLASSPATH=
|
|
||||||
fi
|
|
||||||
|
|
||||||
for j in $GERRIT2_HOME/lib/*.jar
|
|
||||||
do
|
do
|
||||||
if [ -f "$j" ]
|
if [ -f "$j" ]
|
||||||
then
|
then
|
||||||
|
|||||||
Reference in New Issue
Block a user