grabardm/lightweight-cobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: update progress reporting and improve script clarity in setup scripts

Browse Source
This commit is contained in:
Даниил Грабарь
2026-05-22 19:09:32 +03:00
parent e3ef99d1f0
commit a7dace79ad
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/setup_ros2_desktop.sh
+12 -8
View File
@@ -8,7 +8,11 @@ export DEBIAN_FRONTEND=noninteractive
PROGRESS() { echo "PROGRESS:$1:$2"; } PROGRESS() { echo "PROGRESS:$1:$2"; }
PROGRESS 0 "Setting up locale..." PROGRESS 0 "Checking dpkg state..."
echo "Checking dpkg state..."
sudo dpkg --configure -a
PROGRESS 5 "Setting up locale..."
echo "Setting up locale..." echo "Setting up locale..."
sudo apt-get update -q sudo apt-get update -q
sudo apt-get install -y -q locales sudo apt-get install -y -q locales
@@ -16,38 +20,38 @@ sudo locale-gen en_US en_US.UTF-8
sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
PROGRESS 8 "Adding universe repository..." PROGRESS 12 "Adding universe repository..."
echo "Adding universe repository..." echo "Adding universe repository..."
sudo apt-get install -y -q software-properties-common sudo apt-get install -y -q software-properties-common
sudo add-apt-repository -y universe sudo add-apt-repository -y universe
PROGRESS 16 "Adding ROS2 GPG key..." PROGRESS 20 "Adding ROS2 GPG key..."
echo "Adding ROS2 GPG key..." echo "Adding ROS2 GPG key..."
sudo apt-get update -q sudo apt-get update -q
sudo apt-get install -y -q curl sudo apt-get install -y -q curl
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key \ sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key \
-o /usr/share/keyrings/ros-archive-keyring.gpg -o /usr/share/keyrings/ros-archive-keyring.gpg
PROGRESS 22 "Configuring ROS2 apt repository..." PROGRESS 26 "Configuring ROS2 apt repository..."
echo "Configuring ROS2 apt repository..." echo "Configuring ROS2 apt repository..."
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] \ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] \
http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo "$UBUNTU_CODENAME") main" \ http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo "$UBUNTU_CODENAME") main" \
| sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
PROGRESS 28 "Updating package lists..." PROGRESS 32 "Updating package lists..."
echo "Updating package lists..." echo "Updating package lists..."
sudo apt-get update -q sudo apt-get update -q
sudo apt-get upgrade -y -q sudo apt-get upgrade -y -q
PROGRESS 35 "Installing ros-jazzy-desktop (this may take a while)..." PROGRESS 38 "Installing ros-jazzy-desktop (this may take a while)..."
echo "Installing ros-jazzy-desktop..." echo "Installing ros-jazzy-desktop..."
sudo apt-get install -y ros-jazzy-desktop sudo apt-get install -y ros-jazzy-desktop
PROGRESS 75 "Installing ROS2 dev tools..." PROGRESS 78 "Installing ROS2 dev tools..."
echo "Installing ROS2 dev tools..." echo "Installing ROS2 dev tools..."
sudo apt-get install -y ros-dev-tools sudo apt-get install -y ros-dev-tools
PROGRESS 88 "Initializing rosdep..." PROGRESS 90 "Initializing rosdep..."
echo "Initializing rosdep..." echo "Initializing rosdep..."
sudo rosdep init 2>/dev/null || true sudo rosdep init 2>/dev/null || true
rosdep update rosdep update
scripts/setup_ros2_ros_base.sh
+12 -8
View File
@@ -8,7 +8,11 @@ export DEBIAN_FRONTEND=noninteractive
PROGRESS() { echo "PROGRESS:$1:$2"; } PROGRESS() { echo "PROGRESS:$1:$2"; }
PROGRESS 0 "Setting up locale..." PROGRESS 0 "Checking dpkg state..."
echo "Checking dpkg state..."
sudo dpkg --configure -a
PROGRESS 5 "Setting up locale..."
echo "Setting up locale..." echo "Setting up locale..."
sudo apt-get update -q sudo apt-get update -q
sudo apt-get install -y -q locales sudo apt-get install -y -q locales
@@ -16,38 +20,38 @@ sudo locale-gen en_US en_US.UTF-8
sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
PROGRESS 8 "Adding universe repository..." PROGRESS 12 "Adding universe repository..."
echo "Adding universe repository..." echo "Adding universe repository..."
sudo apt-get install -y -q software-properties-common sudo apt-get install -y -q software-properties-common
sudo add-apt-repository -y universe sudo add-apt-repository -y universe
PROGRESS 16 "Adding ROS2 GPG key..." PROGRESS 20 "Adding ROS2 GPG key..."
echo "Adding ROS2 GPG key..." echo "Adding ROS2 GPG key..."
sudo apt-get update -q sudo apt-get update -q
sudo apt-get install -y -q curl sudo apt-get install -y -q curl
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key \ sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key \
-o /usr/share/keyrings/ros-archive-keyring.gpg -o /usr/share/keyrings/ros-archive-keyring.gpg
PROGRESS 22 "Configuring ROS2 apt repository..." PROGRESS 26 "Configuring ROS2 apt repository..."
echo "Configuring ROS2 apt repository..." echo "Configuring ROS2 apt repository..."
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] \ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] \
http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo "$UBUNTU_CODENAME") main" \ http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo "$UBUNTU_CODENAME") main" \
| sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
PROGRESS 28 "Updating package lists..." PROGRESS 32 "Updating package lists..."
echo "Updating package lists..." echo "Updating package lists..."
sudo apt-get update -q sudo apt-get update -q
sudo apt-get upgrade -y -q sudo apt-get upgrade -y -q
PROGRESS 35 "Installing ros-jazzy-ros-base (this may take a while)..." PROGRESS 38 "Installing ros-jazzy-ros-base (this may take a while)..."
echo "Installing ros-jazzy-ros-base..." echo "Installing ros-jazzy-ros-base..."
sudo apt-get install -y ros-jazzy-ros-base sudo apt-get install -y ros-jazzy-ros-base
PROGRESS 75 "Installing ROS2 dev tools..." PROGRESS 78 "Installing ROS2 dev tools..."
echo "Installing ROS2 dev tools..." echo "Installing ROS2 dev tools..."
sudo apt-get install -y ros-dev-tools sudo apt-get install -y ros-dev-tools
PROGRESS 88 "Initializing rosdep..." PROGRESS 90 "Initializing rosdep..."
echo "Initializing rosdep..." echo "Initializing rosdep..."
sudo rosdep init 2>/dev/null || true sudo rosdep init 2>/dev/null || true
rosdep update rosdep update