Browse Source

更新下载代码的脚本,现在只能下载master分之代码,后面增加kinetic和树莓派分支代码

corvin 5 years ago
parent
commit
dff1e59900
4 changed files with 6 additions and 7 deletions
  1. 1 0
      .catkin_workspace
  2. 1 0
      .gitignore
  3. 4 6
      scripts/download_voice_code.sh
  4. 0 1
      scripts/setup_config.sh

+ 1 - 0
.catkin_workspace

@@ -0,0 +1 @@
+# This file currently only serves to mark the location of a catkin workspace for tool integration

+ 1 - 0
.gitignore

@@ -1,4 +1,5 @@
 # ---> ROS
+devel/
 build/
 bin/
 lib/

+ 4 - 6
scripts/download_voice_code.sh

@@ -40,13 +40,11 @@ while [ $SELECT_OK == "false" ]
 do
 read -p "Please select download branch code based on your device and ros version: " index
 case $index in
-    1)GIT_BRANCH="ubuntu14.04_x64_indigo"
+    1)GIT_BRANCH="ubuntu16.04_kinetic"
       SELECT_OK="true";;
-    2)GIT_BRANCH="ubuntu16.04_x64_kinetic"
+    2)GIT_BRANCH="raspberry_kinetic"
       SELECT_OK="true";;
-    3)GIT_BRANCH="raspberry_jessie_indigo"
-      SELECT_OK="true";;
-    4)GIT_BRANCH="raspberry_ubuntuMate16.04_kinetic"
+    3)GIT_BRANCH="master"
       SELECT_OK="true";;
     *) echo -e "${red}Selected index error! ${normal}";;
 esac
@@ -61,7 +59,7 @@ then
   sudo apt-get install -y git
   if [ $? -eq 0 ]
   then
-      git clone -b ${GIT_BRANCH} http://corvin.cn:8081/gerrit/ros_voice_system
+      git clone -b ${GIT_BRANCH} https://code.corvin.cn:3000/ros_voice_system.git
       if [ $? -ne 0 ]
       then
           echo -e "${red}ERROR! Git clone source code unknown error, please retry later...${normal}"

+ 0 - 1
scripts/setup_config.sh

@@ -154,4 +154,3 @@ echo -e "${green} roslaunch voice_bringup voice_bringup.launch ${normal}"
 echo -e "${green}-------------------------------------------------${normal}"
 roslaunch voice_bringup voice_bringup.launch
 
-