更新update_code.sh脚本,还原代码后需要将分支也切换回master

update_code.sh

@@ -18,6 +18,7 @@ normal="\e[0m"
 echo -e "\n"
 echo -e "${green}>>> 1: 开始从服务器更新代码${normal}"
 git reset --hard origin/master
+git checkout master
 git pull origin master
 if [ $? -eq 0 ];then
     echo -e "${green}更新代码完成,准备编译代码...${normal}"
@@ -33,7 +34,7 @@ rm -rf ~/.ros/log/
 catkin_make
 
 if [ $? -eq 0 ];then
-    source ~/panda_ws/devel/setup.bash
+    source /home/corvin/panda_ws/devel/setup.bash
     echo -e "${green}>>> 编译ROS代码完成,现在编译oled屏幕代码...${normal}"
 else
     echo -e "${red}编译代码发生错误,请检查代码${normal}"
@@ -42,7 +43,7 @@ fi
 echo -e "\n"
 
 touch ~/.bat
-cd src/oled_screen/build/
+cd /home/corvin/panda_ws/src/oled_screen/build/
 rm -rf *
 cmake ..
 make