Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#735 fixing issue with classpath separator #736

Merged
merged 1 commit into from Apr 25, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion flyway-commandline/src/main/assembly/flyway
Expand Up @@ -17,6 +17,10 @@

# Save current directory
OLDDIR=`pwd`
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
esac

# resolve links - $0 may be a softlink
PRG="$0"
Expand Down Expand Up @@ -49,7 +53,14 @@ else
CONSOLE_WIDTH=80
fi

"$JAVA_CMD" -cp ./bin/flyway-commandline-${project.version}.jar:./bin/flyway-core-${project.version}.jar org.flywaydb.commandline.Main $@ -consoleWidth=$CONSOLE_WIDTH

CP="./bin/flyway-commandline-${project.version}.jar:./bin/flyway-core-${project.version}.jar"

if $cygwin; then
CP=$(cygpath -pw "$CP")
fi

"$JAVA_CMD" -cp "$CP" org.flywaydb.commandline.Main $@ -consoleWidth=$CONSOLE_WIDTH

# Save the exit code
JAVA_EXIT_CODE=$?
Expand Down