@@ -5,7 +5,7 @@ set -eEuo pipefail
5
5
DIR=" $( dirname " $( readlink -f " $0 " ) " ) "
6
6
BRANCH=" ${1:- main} "
7
7
ROS_DISTRO=${ROS_DISTRO:- " jazzy" }
8
- COLCON_WS=" ${COLCON_WS:- " $HOME /colcon_ws " } "
8
+ COLCON_WS=" ${COLCON_WS:- " $HOME /bitbots_main " } "
9
9
REPO_URL=
" [email protected] :bit-bots/bitbots_main.git"
10
10
SHELL_CONFIG=" $( cat << EOF
11
11
@@ -22,7 +22,7 @@ export ROS_DOMAIN_ID=24
22
22
export ROS_AUTOMATIC_DISCOVERY_RANGE=LOCALHOST
23
23
24
24
# Set the default colcon workspace
25
- export COLCON_WS="\$ HOME/colcon_ws "
25
+ export COLCON_WS="\$ HOME/bitbots_main "
26
26
27
27
# Set the default log level for colcon
28
28
export COLCON_LOG_LEVEL=30
@@ -68,6 +68,7 @@ setup_ros() {
68
68
fi
69
69
70
70
sudo apt update && sudo apt install -y \
71
+ just \
71
72
clang-format \
72
73
cppcheck \
73
74
python3-colcon-clean \
@@ -103,10 +104,10 @@ setup_repo() {
103
104
104
105
echo " Installing dependencies..."
105
106
if (( has_sudo )) ; then
106
- make install
107
+ just install
107
108
else
108
109
echo " Cannot use rosdep as it requires sudo."
109
- make install-no-root
110
+ just install-no-root
110
111
fi
111
112
}
112
113
@@ -118,12 +119,6 @@ setup_colcon() {
118
119
git+https://github.com/timonegk/colcon-core.git@colors \
119
120
git+https://github.com/timonegk/colcon-notification.git@colors \
120
121
git+https://github.com/timonegk/colcon-output.git@colors
121
-
122
- if [[ ! -d " $COLCON_WS /src/bitbots_main" ]]; then
123
- echo " Setting up colcon workspace in $COLCON_WS ..."
124
- mkdir -p " $COLCON_WS /src"
125
- ln -s " $meta_dir " " $COLCON_WS /src/bitbots_main"
126
- fi
127
122
}
128
123
129
124
build_repository () {
@@ -133,7 +128,7 @@ build_repository() {
133
128
set +u
134
129
source " /opt/ros/${ROS_DISTRO} /setup.bash"
135
130
136
- colcon build --symlink-install --continue-on-error
131
+ just build
137
132
}
138
133
139
134
setup_shell_aliases () {
0 commit comments