@@ -20,8 +20,8 @@ cd "$CURR_DIR" || exit
2020
2121source util.sh
2222
23- arch =$( uname -m)
24- print_status_msg " Detected architecture: ${arch } "
23+ g_arch =$( uname -m) # Global variable. No function should use this name.
24+ print_status_msg " Detected architecture: ${g_arch } "
2525
2626print_status_msg " Installing Utilities and Dependencies"
2727
4545# (sorted alphabetically)
4646host_software_packages=(
4747 cmake # Needed to build some of our dependencies
48+ clang-format-14 # Used to format C++ code
4849 codespell # Fixes typos
4950 curl
5051 default-jdk # Needed for Bazel to run properly
@@ -144,10 +145,6 @@ if ! sudo /opt/tbotspython/bin/python3 -m pip install --upgrade pip ; then
144145 exit 1
145146fi
146147
147- if [[ $( lsb_release -rs) == " 20.04" ]]; then
148- sudo /opt/tbotspython/bin/pip3 install -r ubuntu20_requirements.txt
149- fi
150-
151148if [[ $( lsb_release -rs) == " 22.04" ]]; then
152149 sudo /opt/tbotspython/bin/pip3 install -r ubuntu22_requirements.txt
153150fi
@@ -160,15 +157,15 @@ sudo chown -R $USER:$USER /opt/tbotspython
160157
161158print_status_msg " Done Setting Up Virtual Python Environment"
162159print_status_msg " Fetching game controller"
163- install_gamecontroller $arch
160+ install_gamecontroller $g_arch
164161
165162print_status_msg " Setting up TIGERS AutoRef"
166163
167164print_status_msg " Installing TIGERS dependency: Java 21"
168- install_java $arch
165+ install_java $g_arch
169166
170167print_status_msg " Compiling TIGERS AutoRef"
171- install_autoref $arch
168+ install_autoref $g_arch
172169
173170sudo chmod +x " $CURR_DIR /../src/software/autoref/run_autoref.sh"
174171sudo cp " $CURR_DIR /../src/software/autoref/DIV_B.txt" " /opt/tbotspython/autoReferee/config/geometry/DIV_B.txt"
@@ -178,20 +175,20 @@ print_status_msg "Finished setting up AutoRef"
178175# Install Bazel
179176print_status_msg " Installing Bazel"
180177
181- install_bazel $arch
178+ install_bazel $g_arch
182179
183180print_status_msg " Done Installing Bazel"
184181
185182print_status_msg " Install clang-format"
186- install_clang_format $arch
183+ install_clang_format $g_arch
187184print_status_msg " Done installing clang-format"
188185
189186print_status_msg " Setting up cross compiler for robot software"
190- install_cross_compiler $arch
187+ install_cross_compiler $g_arch
191188print_status_msg " Done setting up cross compiler for robot software"
192189
193190print_status_msg " Setting Up Python Development Headers"
194- install_python_dev_cross_compile_headers $arch
191+ install_python_dev_cross_compile_headers $g_arch
195192print_status_msg " Done Setting Up Python Development Headers"
196193
197194print_status_msg " Setting Up PlatformIO"
0 commit comments