From f2d3a24f7ca964dcab2e7e4454dc20d1d545a8dd Mon Sep 17 00:00:00 2001 From: Woen-Sug Choi Date: Sat, 1 Jun 2024 07:23:42 +0900 Subject: [PATCH] line width fix --- .pre-commit-config.yaml | 21 +++++----- extras/lint_local/lint_local.sh | 2 +- extras/ros-jazzy-gz-harmonic-install.sh | 53 ++++++++++++++++++++++--- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c58bf2c0..0cf56a55 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,16 +13,16 @@ # See https://github.com/pre-commit/pre-commit --- ci: - autofix_commit_msg: | - [pre-commit.ci] auto fixes from pre-commit.com hooks + autofix_commit_msg: | + [pre-commit.ci] auto fixes from pre-commit.com hooks - for more information, see https://pre-commit.ci - autofix_prs: true - autoupdate_branch: ros2 - autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' - autoupdate_schedule: weekly - skip: [] - submodules: false + for more information, see https://pre-commit.ci + autofix_prs: true + autoupdate_branch: ros2 + autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate" + autoupdate_schedule: weekly + skip: [] + submodules: false repos: # Standard hooks @@ -165,9 +165,8 @@ repos: types: [text] files: \.(xacro|urdf|sdf|xml|launch)$ - - repo: https://github.com/turo/pre-commit-hooks - rev: v3.5.0 # You may version pin this if desired + rev: v3.5.0 hooks: - id: docker-lint files: \.dockerfile diff --git a/extras/lint_local/lint_local.sh b/extras/lint_local/lint_local.sh index c5725414..293420ff 100755 --- a/extras/lint_local/lint_local.sh +++ b/extras/lint_local/lint_local.sh @@ -88,7 +88,7 @@ if [ "$all_dependencies_installed" = true ]; then find . \( -iname 'CMakeLists.txt' -o -iname '*.cmake' \) -print0 | xargs -0 cmake-lint # shellcheck disable=SC2028 - echo "\033[32mAll linting processes completed. Awesome!\033[0m" + echo -e "\033[32mAll linting completed. Awesome! Not ready to make PR. 🤘🚀 \033[0m" else echo -e "\033[31mNot all dependencies are installed. \ Please install the missing packages before proceeding.\033[0m" diff --git a/extras/ros-jazzy-gz-harmonic-install.sh b/extras/ros-jazzy-gz-harmonic-install.sh index 78feb62f..46b0ced2 100644 --- a/extras/ros-jazzy-gz-harmonic-install.sh +++ b/extras/ros-jazzy-gz-harmonic-install.sh @@ -31,15 +31,56 @@ sudo apt install -y \ echo "Installation complete!" -sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg +sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key \ + -o /usr/share/keyrings/ros-archive-keyring.gpg + +ARCH=$(dpkg --print-architecture) # shellcheck disable=SC1091 -# shellcheck disable=SC2086 -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2-testing/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list >/dev/null -sudo wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list >/dev/null +UBUNTU_CODENAME=$( . /etc/os-release && echo "$UBUNTU_CODENAME") +REPO="deb [arch=$ARCH signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] \ +http://packages.ros.org/ros2-testing/ubuntu $UBUNTU_CODENAME main" +echo "$REPO" | sudo tee /etc/apt/sources.list.d/ros2.list >/dev/null + +DISTRO=$(lsb_release -cs) +REPO="deb [arch=$ARCH signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] \ +http://packages.osrfoundation.org/gazebo/ubuntu-stable $DISTRO main" + +echo "$REPO" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list >/dev/null + sudo apt update DIST=jazzy GAZ=gz-harmonic -sudo apt install -y ${GAZ} python3-rosdep python3-rosinstall-generator python3-vcstool ros-${DIST}-gz-plugin-vendor ros-${DIST}-gz-ros2-control ros-${DIST}-effort-controllers ros-${DIST}-geographic-info ros-${DIST}-image-view ros-${DIST}-joint-state-publisher ros-${DIST}-joy ros-${DIST}-joy-teleop ros-${DIST}-key-teleop ros-${DIST}-moveit-planners ros-${DIST}-moveit-simple-controller-manager ros-${DIST}-moveit-ros-visualization ros-${DIST}-pcl-ros ros-${DIST}-robot-localization ros-${DIST}-robot-state-publisher ros-${DIST}-ros-base ros-${DIST}-ros2-controllers ros-${DIST}-rqt ros-${DIST}-rqt-common-plugins ros-${DIST}-rviz2 ros-${DIST}-teleop-tools ros-${DIST}-teleop-twist-joy ros-${DIST}-teleop-twist-keyboard ros-${DIST}-tf2-geometry-msgs ros-${DIST}-tf2-tools ros-${DIST}-urdfdom-py ros-${DIST}-xacro +sudo apt install -y \ + ${GAZ} \ + python3-rosdep \ + python3-rosinstall-generator \ + python3-vcstool \ + ros-${DIST}-gz-plugin-vendor \ + ros-${DIST}-gz-ros2-control \ + ros-${DIST}-effort-controllers \ + ros-${DIST}-geographic-info \ + ros-${DIST}-image-view \ + ros-${DIST}-joint-state-publisher \ + ros-${DIST}-joy \ + ros-${DIST}-joy-teleop \ + ros-${DIST}-key-teleop \ + ros-${DIST}-moveit-planners \ + ros-${DIST}-moveit-simple-controller-manager \ + ros-${DIST}-moveit-ros-visualization \ + ros-${DIST}-pcl-ros \ + ros-${DIST}-robot-localization \ + ros-${DIST}-robot-state-publisher \ + ros-${DIST}-ros-base \ + ros-${DIST}-ros2-controllers \ + ros-${DIST}-rqt \ + ros-${DIST}-rqt-common-plugins \ + ros-${DIST}-rviz2 \ + ros-${DIST}-teleop-tools \ + ros-${DIST}-teleop-twist-joy \ + ros-${DIST}-teleop-twist-keyboard \ + ros-${DIST}-tf2-geometry-msgs \ + ros-${DIST}-tf2-tools \ + ros-${DIST}-urdfdom-py \ + ros-${DIST}-xacro