wip

vdesabou · Jul 27, 2023 · d9aa5ab · d9aa5ab
1 parent 36d6e98
commit d9aa5ab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/scripts/cli/playground b/scripts/cli/playground
@@ -7685,7 +7685,7 @@ function force_enable () {
   env_variable=$2
 
   logwarn "💪 Forcing $flag ($env_variable env variable)"
-  line_final_source=$(grep -n 'source ${DIR}/../../scripts/utils.sh' $repro_test_file | cut -d ":" -f 1 | tail -n1)
+  line_final_source=$(grep -n 'source ${DIR}/../../scripts/utils.sh$' $repro_test_file | cut -d ":" -f 1 | tail -n1)
   tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
   trap 'rm -rf $tmp_dir' EXIT
   echo "# remove or comment those lines if you don't need it anymore" > $tmp_dir/tmp_force_enable
@@ -8745,6 +8745,7 @@ playground_bootstrap_reproduction_model_command() {
 
   tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
   trap 'rm -rf $tmp_dir' EXIT
+  set +e
   echo "#!/bin/bash" > $tmp_dir/intro
   echo "###############################################" >> $tmp_dir/intro
   echo "# 🗓️ date: `date`" >> $tmp_dir/intro

diff --git a/scripts/cli/src/bootstrap_reproduction_model_command.sh b/scripts/cli/src/bootstrap_reproduction_model_command.sh
@@ -171,6 +171,7 @@ fi
 
 tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
 trap 'rm -rf $tmp_dir' EXIT
+set +e
 echo "#!/bin/bash" > $tmp_dir/intro
 echo "###############################################" >> $tmp_dir/intro
 echo "# 🗓️ date: `date`" >> $tmp_dir/intro

diff --git a/scripts/cli/src/lib/utils_function.sh b/scripts/cli/src/lib/utils_function.sh
@@ -3413,7 +3413,7 @@ function force_enable () {
   env_variable=$2
 
   logwarn "💪 Forcing $flag ($env_variable env variable)"
-  line_final_source=$(grep -n 'source ${DIR}/../../scripts/utils.sh' $repro_test_file | cut -d ":" -f 1 | tail -n1)
+  line_final_source=$(grep -n 'source ${DIR}/../../scripts/utils.sh$' $repro_test_file | cut -d ":" -f 1 | tail -n1)
   tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
   trap 'rm -rf $tmp_dir' EXIT
   echo "# remove or comment those lines if you don't need it anymore" > $tmp_dir/tmp_force_enable