|
@@ -12,6 +12,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}"
|
|
@@ -27,7 +28,7 @@ rm -rf ~/.ros/log/
|
|
|
catkin_make
|
|
|
|
|
|
if [ $? -eq 0 ];then
|
|
|
- source ~/ros_minibot_ws/devel/setup.bash
|
|
|
+ source /home/corvin/ros_minibot_ws/devel/setup.bash
|
|
|
echo -e "${green}>>> 编译ROS代码完成,现在编译oled屏幕代码...${normal}"
|
|
|
else
|
|
|
echo -e "${red}编译代码发生错误,请检查代码${normal}"
|
|
@@ -35,7 +36,7 @@ else
|
|
|
fi
|
|
|
echo -e "\n"
|
|
|
|
|
|
-cd src/oled_screen/build/
|
|
|
+cd /home/corvin/ros_minibot_ws/src/oled_screen/build/
|
|
|
rm -rf *
|
|
|
cmake ..
|
|
|
make
|