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>

appdist/src/main/bin/gerrit2.sh

@@ -54,26 +54,17 @@ case "$1" in
 	;;
 esac
 
-if [ $# = 0 ]
+if [ -z "$config_dir" ] || [ $# = 0 ]
 then
-	echo >&2 "usage: $0 [--config=gs.prop] AppName [args]"
-	exit 1
+    echo >&2 "usage: $0 --config=gs.prop AppName [args]"
+    exit 1
 fi
+
 app=$1
 shift
 
-if [ -n "$config_dir" ]
-then
-	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
+CLASSPATH=$config_dir
+for j in $GERRIT2_HOME/lib/*.jar $GERRIT2_HOME/jdbc/*.jar
 do
 	if [ -f "$j" ]
 	then