From e2d06e93dff354649e4cab3670e1645c07694b61 Mon Sep 17 00:00:00 2001 From: Giridhar Vitta Bukka Date: Wed, 26 Jun 2024 19:27:19 +0200 Subject: [PATCH 1/2] nala related correction --- scripts/setup-ros-workspace.bash | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/setup-ros-workspace.bash b/scripts/setup-ros-workspace.bash index 3296ecb4..940bf378 100755 --- a/scripts/setup-ros-workspace.bash +++ b/scripts/setup-ros-workspace.bash @@ -376,16 +376,11 @@ create_workspace_docker () { let CUT_LINE=$TEST_LINE+0 tail -n +$CUT_LINE $TMP_FILE >> $DOCKER_FILE - # Add repositories for Nala - mv $DOCKER_FILE "$TMP_FILE" - TEST_LINE=`awk '$1 == "#" && $2 == "install" && $3 == "nala" { print NR }' $TMP_FILE` # get line before `# install nala and upgrade` dependency - let CUT_LINE=$TEST_LINE-0 - head -$CUT_LINE $TMP_FILE > $DOCKER_FILE # Add last part let CUT_LINE=$TEST_LINE+2 tail -n +$CUT_LINE $TMP_FILE >> $DOCKER_FILE - + # Cleanup temp files rm $TMP_FILE fi From 5d5b342e619ece5dd26032378f2b19f14a9a7322 Mon Sep 17 00:00:00 2001 From: "Dr. Denis" Date: Thu, 27 Jun 2024 10:45:44 +0200 Subject: [PATCH 2/2] fix formatting --- scripts/setup-ros-workspace.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/setup-ros-workspace.bash b/scripts/setup-ros-workspace.bash index 940bf378..d33ec544 100755 --- a/scripts/setup-ros-workspace.bash +++ b/scripts/setup-ros-workspace.bash @@ -380,7 +380,6 @@ create_workspace_docker () { # Add last part let CUT_LINE=$TEST_LINE+2 tail -n +$CUT_LINE $TMP_FILE >> $DOCKER_FILE - # Cleanup temp files rm $TMP_FILE fi