Remove >>> wrapping <<< if folding is supported

ros-industrial · Apr 8, 2021 · 1735535 · 1735535
1 parent 21c5d5c
commit 1735535
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/industrial_ci/src/folding/none.sh b/industrial_ci/src/folding/none.sh
@@ -17,8 +17,10 @@
 
 function  ici_start_fold() {
     shift 3
+    ici_color_output $ANSI_BLUE ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
 }
 
 function  ici_end_fold() {
     shift 4
+    ici_color_output "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
 }
diff --git a/industrial_ci/src/util.sh b/industrial_ci/src/util.sh
@@ -117,9 +117,7 @@ function ici_time_start {
     echo # blank line
 
     ici_start_fold "$ICI_TIME_ID" "$ICI_FOLD_NAME" "$ICI_START_TIME"
-
-    ici_color_output $ANSI_BLUE ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-    ici_color_output $ANSI_BLUE "Starting function '$ICI_FOLD_NAME'"
+    ici_color_output $ANSI_BLUE "$ICI_FOLD_NAME"
     if [ "$DEBUG_BASH" ] && [ "$DEBUG_BASH" == true ]; then set -x; fi
 }
 
@@ -148,10 +146,9 @@ function ici_time_end {
     local end_time; end_time=$(date -u +%s%N)
     local elapsed_seconds; elapsed_seconds=$(( (end_time - ICI_START_TIME)/1000000000 ))
 
+    echo -en "\e[${color_wrap}m"  # just set color, no output
     ici_end_fold "$ICI_TIME_ID" "$name" "$ICI_START_TIME" "$end_time"
-
-    ici_color_output "$color_wrap" "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
-    ici_color_output "$color_wrap" "Function '$name' returned with code '${exit_code}' after $(( elapsed_seconds / 60 )) min $(( elapsed_seconds % 60 )) sec"
+    ici_color_output "$color_wrap" "'$name' returned with code '${exit_code}' after $(( elapsed_seconds / 60 )) min $(( elapsed_seconds % 60 )) sec"
 
     ICI_FOLD_NAME=
     if [ "$DEBUG_BASH" ] && [ "$DEBUG_BASH" == true ]; then set -x; fi