fix(setup.sh): installation issues

- run ros apt key download with `sudo` to access `/usr/share`
- add python bins in `~/.local/bin` to `PATH`
- add `BRANCH` argument, of `bitbots_main` branch to checkout

Author: texhnolyze

bitbots_misc/bitbots_docs/docs/manual/tutorials/install_software_ros2.rst

@@ -99,6 +99,9 @@ In case you are not using the bash shell, replace ``~/.bashrc`` and ``bash`` wit
 
   # >>> bit-bots initialize >>>
 
+  # Add python pip bins to PATH
+  export PATH="\$HOME/.local/bin:\$PATH"
+
   # Ignore some deprecation warnings
   export PYTHONWARNINGS="ignore:::setuptools.command.install,ignore:::setuptools.command.easy_install,ignore:::pkg_resources,ignore:easy_install command is deprecated,ignore:setup.py install is deprecated"
 

scripts/setup.sh

@@ -2,14 +2,18 @@
 set -eEuo pipefail
 
 # static/global variables
-ROS_DISTRO=${ROS_DISTRO:-"jazzy"}
 DIR="$(dirname "$(readlink -f "$0")")"
+BRANCH="${1:-main}"
+ROS_DISTRO=${ROS_DISTRO:-"jazzy"}
 COLCON_WS="${COLCON_WS:-"$HOME/colcon_ws"}"
 REPO_URL="git@github.com:bit-bots/bitbots_main.git"
 SHELL_CONFIG="$(cat <<EOF
 
 # >>> bit-bots initialize >>>
 
+# Add python pip bins to PATH
+export PATH="\$HOME/.local/bin:\$PATH"
+
 # Ignore some deprecation warnings
 export PYTHONWARNINGS="ignore:::setuptools.command.install,ignore:::setuptools.command.easy_install,ignore:::pkg_resources,ignore:easy_install command is deprecated,ignore:setup.py install is deprecated"
 
@@ -59,7 +63,7 @@ setup_ros() {
         if [[ ! -f /etc/apt/sources.list.d/ros2.list ]]; then
             echo "Adding ROS 2 repository..."
             sudo apt install -y curl lsb-release
-            curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key > /usr/share/keyrings/ros-archive-keyring.gpg
+            sudo sh -c "curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key > /usr/share/keyrings/ros-archive-keyring.gpg"
             sudo sh -c "echo 'deb [signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main' > /etc/apt/sources.list.d/ros2.list"
         fi
 
@@ -86,10 +90,11 @@ setup_repo() {
 
     if (( in_repo )); then
         cd "$meta_dir" || exit
+        git checkout "$BRANCH"
     else
         if [[ ! -d "$PWD/bitbots_main" ]]; then
             git clone "$REPO_URL"
-            git switch feature/jazzy-ubuntu2404-devcontainer
+            git checkout "$BRANCH"
         fi
 
         meta_dir="$(realpath "$PWD/bitbots_main")"