modified environment so that the setup.zsh is sourced

DLR-TS · Dec 5, 2024 · 738e1ef · 738e1ef
1 parent 0e6a15b
commit 738e1ef
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 78 deletions.
diff --git a/adore_cli.mk b/adore_cli.mk
@@ -135,7 +135,7 @@ adore_cli_run:
         make adore_cli_start; \
     fi
 	@echo "Executing command in container ${ADORE_CLI_CONTAINER_NAME}: $(cmd)"
-	docker exec --workdir /tmp/adore -it ${ADORE_CLI_CONTAINER_NAME} bash -c "source setup.sh && $(cmd)"
+	docker exec --workdir /tmp/adore -it ${ADORE_CLI_CONTAINER_NAME} zsh -c "source ~/.zshrc && $(cmd)"
 
 
 .PHONY: adore_cli_start_headless

diff --git a/docker/files/.zshrc b/docker/files/.zshrc
@@ -30,5 +30,6 @@ PROMPT='%B%F{grey}%F{cyan}ADORe CLI:%F %{$fg_bold[green]%}%c %{$reset_color%}$(g
 alias help='bash /tmp/adore_cli/tools/adore_cli_help.sh'
 source /opt/ros/${ROS_DISTRO}/setup.zsh
 if [ -f /tmp/adore/setup.sh ]; then
+    export SHELL=zsh
     source /tmp/adore/setup.sh 
 fi
diff --git a/setup.sh b/setup.sh
@@ -0,0 +1,3 @@
+SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+ROS2_WORKSPACE_DIRECTORY="$(realpath "${SCRIPT_DIRECTORY}/ros2_workspace")"
+source /opt/ros/${ROS_DISTRO}/setup.zsh
diff --git a/tools/adore_cli.sh b/tools/adore_cli.sh
@@ -39,5 +39,5 @@ bash "/tmp/adore_cli/tools/git_repo_status.sh"
 bash "/tmp/adore_cli/tools/requirements_file_change_status.sh"
 
 printf "\n"
-zsh
 
+zsh
diff --git a/tools/run_test_scenarios.sh b/tools/run_test_scenarios.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,5 +39,5 @@ bash "/tmp/adore_cli/tools/git_repo_status.sh" @@
     bash "/tmp/adore_cli/tools/requirements_file_change_status.sh"
     printf "\n"
-    zsh
+    zsh