From dfdd8cac949cb1dce070c479c939353ee84037f7 Mon Sep 17 00:00:00 2001 From: Ivan Porto Carrero Date: Thu, 9 May 2013 20:43:55 -0600 Subject: [PATCH] fixes #52: running the validator now uses the sbt-assembly generated jar --- bin/validate.sh | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/bin/validate.sh b/bin/validate.sh index 4b8c554c164..eebc3160eb3 100755 --- a/bin/validate.sh +++ b/bin/validate.sh @@ -1,6 +1,31 @@ -#!/bin/bash -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +#!/bin/sh + +SCRIPT="$0" + +while [ -h "$SCRIPT" ] ; do + ls=`ls -ld "$SCRIPT"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + SCRIPT="$link" + else + SCRIPT=`dirname "$SCRIPT"`/"$link" + fi +done + +if [ ! -d "${APP_DIR}" ]; then + APP_DIR=`dirname "$SCRIPT"`/.. + APP_DIR=`cd "${APP_DIR}"; pwd` +fi + +cd $APP_DIR + + +# if you've executed sbt assembly previously it will use that instead. +ags="com.wordnik.swagger.codegen.spec.Validator $@" + +if [ -f $APP_DIR/target/swagger-codegen.jar ]; then + java -cp target/swagger-codegen.jar $ags +else + ./sbt "run-main $ags" +fi -export CLASSPATH="$DIR/../target/lib/*:$DIR/../target/*" -export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -JAVA_OPTS=$JAVA_OPTS scala -cp $CLASSPATH com.wordnik.swagger.codegen.spec.Validator "$@"