Skip to content

Commit 31191fe

Browse files
Fix some lint problems
1 parent 1986a7d commit 31191fe

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

.devcontainer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// Default configuration for attached container
21
{
32
"userEnvProbe": "loginInteractiveShell",
43
"remoteUser": "$DOCKER_USER",
5-
"workspaceFolder": "$COLCON_WORKSPACE_FOLDER/ros2.code-workspace",
4+
"workspaceFolder": "$COLCON_WORKSPACE_FOLDER/ros2.code-workspace"
65
}

setup_auto_complete.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
complete -W "$(docker ps -a --format {{.Names}})" ./setup_workspace.sh
3+
complete -W "$(docker ps -a --format '{{.Names}}')" ./setup_workspace.sh

setup_workspace.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
usage() {
4-
printf "Usage: $0 [options] CONTAINER_NAME\n\n"
4+
printf "Usage: %s [options] CONTAINER_NAME\n\n" "$0"
55
printf "Setup vscode workspace for specified container\n\n"
66
printf "Options:\n"
77
printf " -h|--help\t\t Shows this help message\n"
@@ -27,7 +27,7 @@ while [ -n "$1" ]; do
2727
*)
2828
CONTAINER_NAME="$1"
2929
shift
30-
[[ ! -z "$@" ]] && echo -e "Invalid arguments: '$@'\n" && usage && exit 1
30+
[ -n "$*" ] && echo -e "Invalid arguments: '$*'\n" && usage && exit 1
3131
break
3232
;;
3333
esac
@@ -41,19 +41,19 @@ if [ -z "$CONTAINER_NAME" ]; then
4141
exit 1
4242
fi
4343

44-
if [ -z $(docker ps -qa --filter name=^$CONTAINER_NAME$) ]; then
44+
if [ -z "$(docker ps -qa --filter name="^$CONTAINER_NAME$")" ]; then
4545
echo "There is no container named '$CONTAINER_NAME'."
4646
exit 1
4747
fi
4848

49-
if [ -z $(docker ps -qa --filter name=^$CONTAINER_NAME$ --filter status=running) ]; then
49+
if [ -z "$(docker ps -qa --filter name="^$CONTAINER_NAME$" --filter status=running)" ]; then
5050
echo "Container '$CONTAINER_NAME' is not running."
5151
exit 1
5252
fi
5353

54-
WORKING_DIR=$(docker inspect -f {{.Config.WorkingDir}} $CONTAINER_NAME)
55-
ROS_DISTRO=$(docker exec $CONTAINER_NAME /bin/bash -c "printenv ROS_DISTRO")
56-
COLCON_WORKSPACE_FOLDER=$(docker exec $CONTAINER_NAME /bin/bash -c "printenv COLCON_WORKSPACE_FOLDER")
54+
WORKING_DIR=$(docker inspect -f '{{.Config.WorkingDir}}' "$CONTAINER_NAME")
55+
ROS_DISTRO=$(docker exec "$CONTAINER_NAME" /bin/bash -c "printenv ROS_DISTRO")
56+
COLCON_WORKSPACE_FOLDER=$(docker exec "$CONTAINER_NAME" /bin/bash -c "printenv COLCON_WORKSPACE_FOLDER")
5757

5858
# Take container WORKING_DIR when $COLCON_WORKSPACE_FOLDER is not defined in the container
5959
COLCON_WORKSPACE_FOLDER=${COLCON_WORKSPACE_FOLDER:-$WORKING_DIR}
@@ -66,22 +66,22 @@ fi
6666

6767
# substitute env variables
6868
export COLCON_WORKSPACE_FOLDER DOCKER_USER ROS_DISTRO
69-
envsubst <.devcontainer.json >$CONTAINER_CONFIG_FOLDER/$CONTAINER_NAME.json
69+
envsubst <.devcontainer.json >"$CONTAINER_CONFIG_FOLDER/$CONTAINER_NAME.json"
7070

7171
# copy config files to inside the container
72-
docker cp ros2.code-workspace $CONTAINER_NAME:$COLCON_WORKSPACE_FOLDER/
73-
docker cp .vscode-format/ $CONTAINER_NAME:$COLCON_WORKSPACE_FOLDER/
72+
docker cp ros2.code-workspace "$CONTAINER_NAME:$COLCON_WORKSPACE_FOLDER/"
73+
docker cp .vscode-format/ "$CONTAINER_NAME:$COLCON_WORKSPACE_FOLDER/"
7474

7575
docker exec orise-foxy-devel apt-get install -y \
7676
python3-pip \
77-
ros-$ROS_DISTRO-ament-copyright \
78-
ros-$ROS_DISTRO-ament-cppcheck \
79-
ros-$ROS_DISTRO-ament-cpplint \
80-
ros-$ROS_DISTRO-ament-flake8 \
81-
ros-$ROS_DISTRO-ament-lint-cmake \
82-
ros-$ROS_DISTRO-ament-pep257 \
83-
ros-$ROS_DISTRO-ament-uncrustify \
84-
ros-$ROS_DISTRO-ament-xmllint
77+
ros-"$ROS_DISTRO"-ament-copyright \
78+
ros-"$ROS_DISTRO"-ament-cppcheck \
79+
ros-"$ROS_DISTRO"-ament-cpplint \
80+
ros-"$ROS_DISTRO"-ament-flake8 \
81+
ros-"$ROS_DISTRO"-ament-lint-cmake \
82+
ros-"$ROS_DISTRO"-ament-pep257 \
83+
ros-"$ROS_DISTRO"-ament-uncrustify \
84+
ros-"$ROS_DISTRO"-ament-xmllint
8585

8686
docker exec orise-foxy-devel pip3 install \
8787
cmake-format \

0 commit comments

Comments
 (0)