Skip to content
Draft
Changes from all commits
Commits
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
39 changes: 24 additions & 15 deletions bin/raydp-submit
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,25 @@ search_target()
IFS=$origin_IFS
}

args=()
conf_args=()
user_args=()
while [ $# -gt 0 ]; do
case "$1" in
--conf)
args+=("--conf")
args+=("$2")
search_target "$2"
shift 2
;;
*)
args+=($1)
shift 1
;;
--ray-conf)
conf_args+=("--ray-conf")
conf_args+=("$2")
shift 2
;;
--conf)
conf_args+=("--conf")
conf_args+=("$2")
search_target "$2"
shift 2
;;
*)
user_args+=($1)
shift 1
;;
esac
done

Expand Down Expand Up @@ -145,15 +151,18 @@ RAYDP_CLASS_PATH="-cp $SPARK_PREF_CP$RAYDP_HOME/jars/*:$SPARK_HOME/conf:$SPARK_H

# merge all
new_args=()
for e in ${args[@]::${#args[@]}-1}
for e in ${conf_args[@]}
do
new_args+=($e)
new_args+=($e)
done
for e in ${added_args[@]}
do
new_args+=($e)
new_args+=($e)
done
for e in ${user_args[@]}
do
new_args+=($e)
done
new_args+=(${args[${#args[@]}-1]})

# set arguments
set -- "${new_args[@]}"
Expand Down
Loading