From b60e4941f26e60cda656f4da2b0412d1719c99b2 Mon Sep 17 00:00:00 2001
From: slfan1989 <slfan1989@apache.org>
Date: Wed, 5 Mar 2025 10:28:01 +0800
Subject: [PATCH] Improve ray-submit script.

---
 bin/raydp-submit | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/bin/raydp-submit b/bin/raydp-submit
index 164733b1..80d15cea 100755
--- a/bin/raydp-submit
+++ b/bin/raydp-submit
@@ -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
 
@@ -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[@]}"