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

[ADAM-510] fix for bash syntax error; add ADDL_JARS check to adam-submit #515

Merged
merged 1 commit into from Dec 1, 2014
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion bin/adam-shell
Expand Up @@ -23,7 +23,7 @@ ADAM_REPO="$(cd `dirname $0`/..; pwd)"
CLASSPATH=$("$ADAM_REPO"/bin/compute-adam-classpath.sh)
ADAM_JARS=$("$ADAM_REPO"/bin/compute-adam-jars.sh)

if [ ! -z "$ADDL_JARS"]; then
if [ ! -z "$ADDL_JARS" ]; then
ADAM_JARS="$ADAM_JARS","$ADDL_JARS"
fi

Expand Down
4 changes: 4 additions & 0 deletions bin/adam-submit
Expand Up @@ -23,6 +23,10 @@ SCRIPT_DIR="$(cd `dirname $0`/..; pwd)"
# Get list of required jars for ADAM
ADAM_JARS=$("$SCRIPT_DIR"/bin/compute-adam-jars.sh)

if [ ! -z "$ADDL_JARS" ]; then
ADAM_JARS="$ADAM_JARS","$ADDL_JARS"
fi

# Binary distribution
REPO_DIR="$SCRIPT_DIR/repo"
if [ ! -d "$REPO_DIR" ]; then
Expand Down