gengxin

diff --git a/2.sdk/new_clean.sh b/2.sdk/new_clean.sh
index 0ccf625..927c53a 100644 (file)
--- a/2.sdk/new_clean.sh
+++ b/2.sdk/new_clean.sh
@@ -39,13 +39,15 @@ else
 
     cd ..
     rm *"_dump".zip
-    mv *"_debug".zip $project_name"_debug_"$build_time.zip
-    mv "craneg_modem_watch"*.zip $project_name"_release_"$build_time.zip
+    file_debug=$project_name"_debug_"$build_time
+    file_release=$project_name"_release_"$build_time
+    mv *"_debug".zip $file_debug.zip
+    mv "craneg_modem_watch"*.zip $file_release.zip
     mv *.zip craneg_modem_watch/
 
     cd craneg_modem_watch/
-    tar -czvf $project_name"_debug_"$build_time.tar.gz $project_name"_debug_"$build_time.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
-    rm $project_name"_debug_"$build_time.zip
+    tar -czvf $file_debug.tar.gz $file_debug.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
+    rm $file_debug.zip
     shell $(pwd) #shell $PWD
     cd ../../../../../
 

diff --git a/2.sdk/new_gui.sh b/2.sdk/new_gui.sh
index 9278fcd..2518187 100644 (file)
--- a/2.sdk/new_gui.sh
+++ b/2.sdk/new_gui.sh
@@ -24,13 +24,15 @@ else
 
     cd ..
     rm *"_dump".zip
-    mv *"_debug".zip $project_name"_debug_"$build_time.zip
-    mv "craneg_modem_watch"*.zip $project_name"_release_"$build_time.zip
+    file_debug=$project_name"_debug_"$build_time
+    file_release=$project_name"_release_"$build_time
+    mv *"_debug".zip $file_debug.zip
+    mv "craneg_modem_watch"*.zip $file_release.zip
     mv *.zip craneg_modem_watch/
 
     cd craneg_modem_watch/
-    tar -czvf $project_name"_debug_"$build_time.tar.gz $project_name"_debug_"$build_time.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
-    rm $project_name"_debug_"$build_time.zip
+    tar -czvf $file_debug.tar.gz $file_debug.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
+    rm $file_debug.zip
     shell $(pwd) #shell $PWD
     cd ../../../../../