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.

Sign up for GitHub

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

Jump to bottom

[ADAM-857] Corrected handling of env vars in bin scripts #859

Merged
merged 1 commit into from
Oct 8, 2015
Merged

[ADAM-857] Corrected handling of env vars in bin scripts #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/adam-shell
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ NEW_OPTIONS=$("$SCRIPT_DIR"/bin/append_to_option.py , --jars "$ADAM_CLI_JAR" "$@
echo "$NEW_OPTIONS"

if [ -z "$SPARK_HOME" ]; then
SPARK_SHELL=$(which spark-shell)
SPARK_SHELL=$(which spark-shell || echo)
else
SPARK_SHELL="$SPARK_HOME"/bin/spark-shell
fi
Expand Down
2 changes: 1 addition & 1 deletion bin/adam-submit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ echo "Using ADAM_MAIN=$ADAM_MAIN"

# Find spark-submit script
if [ -z "$SPARK_HOME" ]; then
SPARK_SUBMIT=$(which spark-submit)
SPARK_SUBMIT=$(which spark-submit || echo)
else
SPARK_SUBMIT="$SPARK_HOME"/bin/spark-submit
fi
Expand Down