File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -40,6 +40,14 @@ if [[ -f ~/.isaac_ros_common-config ]]; then
4040 . ~ /.isaac_ros_common-config
4141fi
4242
43+ # Override with config from project directory if exists (and is defined)
44+ if [[ ! -z " ${PROJECT_ROOT} " ]]; then
45+ print_info " Sourcing project config at: ${PROJECT_ROOT} "
46+ if [[ -f " ${PROJECT_ROOT} /.isaac_ros_common-config" ]]; then
47+ . " ${PROJECT_ROOT} /.isaac_ros_common-config"
48+ fi
49+ fi
50+
4351# Prepend configured docker search dirs
4452if [ ${# CONFIG_DOCKER_SEARCH_DIRS[@]} -gt 0 ]; then
4553 for (( i= ${# CONFIG_DOCKER_SEARCH_DIRS[@]} - 1 ; i>= 0 ; i-- )) ; do
Original file line number Diff line number Diff line change @@ -33,6 +33,17 @@ if [[ -f ~/.isaac_ros_common-config ]]; then
3333 . ~ /.isaac_ros_common-config
3434fi
3535
36+ # Override with config from project directory if exists (and is defined)
37+ if [[ ! -z " ${PROJECT_ROOT} " ]]; then
38+ print_info " Sourcing project config at: ${PROJECT_ROOT} "
39+ if [[ -f " ${PROJECT_ROOT} /.isaac_ros_common-config" ]]; then
40+ . " ${PROJECT_ROOT} /.isaac_ros_common-config"
41+ fi
42+
43+ # Make the project root available to nested scripts, eg. build_image_layers.sh
44+ export PROJECT_ROOT=" ${PROJECT_ROOT} "
45+ fi
46+
3647# Parse command-line args
3748IMAGE_KEY=ros2_humble
3849
You can’t perform that action at this time.
0 commit comments