Skip to content

Make launch.sh(.tpl) Posix shell compliant #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make launch.sh(.tpl) Posix shell compliant #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ros2/ament.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def _sh_launcher_rule_impl(ctx):
ctx.attr.substitutions,
{
"{{ament_prefix_path}}": ament_prefix_path,
"{{bash_bin}}": ctx.toolchains[SH_TOOLCHAIN].path,
"{{sh_bin}}": ctx.toolchains[SH_TOOLCHAIN].path,
},
)

Expand Down
10 changes: 5 additions & 5 deletions ros2/launch.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!{{bash_bin}}
#!{{sh_bin}}

set -o errexit -o nounset -o pipefail
set -eu

if [[ ! -z "${BAZEL_TEST:-}" ]]; then
if [ -n "${BAZEL_TEST:-}" ]; then
bazel_test_output_dir="${TEST_UNDECLARED_OUTPUTS_DIR:-${TEST_TMPDIR}}"
if [[ -z "${ROS_HOME:-}" ]]; then
if [ -z "${ROS_HOME:-}" ]; then
export ROS_HOME="${bazel_test_output_dir}"
fi
if [[ -z "${ROS_LOG_DIR:-}" ]]; then
if [ -z "${ROS_LOG_DIR:-}" ]; then
export ROS_LOG_DIR="${bazel_test_output_dir}"
fi
fi
Expand Down