XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

Author: user-54dbb57a

bin/ent

@@ -30,6 +30,9 @@ RUN() {
     cmd=$(_resolve_alias "$cmd")
 
     shift
+    
+    [ "$ENTANDO_ENT_TRACE" == "true" ] && set -x
+    
     case "$cmd" in
       "version") #H: shows the version of the current ent
         which_ent version

bin/mod/ent-help

@@ -85,6 +85,7 @@ cd ..
   echo -e "  --profile|-p {profile}   forces the use of the given profile"
   echo -e "  --no-profile|-P          forces the use of no profile"
   echo -e "  --debug|-d               enables the debug mode for some command"
+  echo -e "  --trace                  enables shell level instruction trace"
   echo -e "  --color                  disables the explicit suppression of the colors for some command"
 
   echo ""

bin/mod/ent-profile

@@ -365,11 +365,15 @@ select_profile_item() {
 
   stdin_to_arr $'\n\r' LST < <(list_profile_items "$type" "$pattern" "$parent")
 
-  if [[ "${#LST[@]}" -le 0 && "$dotdot" == "false" ]]; then
+  if [[ "${#LST[@]}" -le 0 || -z "${LST[0]}" ]] && [[ "$dotdot" == "false" ]]; then
    # No match
     _tmp_result=""
     return 1
   fi
+  
+  echo "#######################################################"
+  echo "#######################################################"
+  echo "#######################################################"
 
   # shellcheck disable=SC2076 disable=SC2199
   if [[ " ${LST[@]} " =~ " ${pattern} " && "$dotdot" == "false" ]]; then

s/_base.sh

@@ -437,17 +437,22 @@ parse_global_args() {
       shift;((ENTANDO_CONSUMED_ARGS++))
       ENTANDO_CLI_FORCE_COLORS=true
       ;;
-    "-d" | "--debug")
+    "--debug")
       shift;((ENTANDO_CONSUMED_ARGS++))
       ENTANDO_ENT_DEBUG=true
       ;;
+    "--trace")
+      shift;((ENTANDO_CONSUMED_ARGS++))
+      ENTANDO_ENT_TRACE=true
+      ;;
     *)
       break
       ;;
     esac
   done
 
   export ENTANDO_ENT_DEBUG
+  export ENTANDO_ENT_TRACE
   export ENTANDO_ENT_FORCE_PROFILE
   export ENTANDO_ENT_FORCE_PROFILE_SUB
 }

s/_conf.sh

@@ -133,7 +133,6 @@ TMP_CLI_VERSION="$(
 ENTANDO_MANIFEST_CLI_VERSION="${ENTANDO_CLI_VERSION:-"$TMP_CLI_VERSION"}"
 ENTANDO_CLI_VERSION="${TMP_CLI_VERSION:-"$ENTANDO_MANIFEST_CLI_VERSION"}"
 
-
 ENTANDO_MANIFEST_RELEASE="$ENTANDO_RELEASE"
 TMP_CLI_VERSION="$(
   cd "$ENTANDO_ENT_HOME/dist" &> /dev/null || exit 1

s/utils.sh

@@ -441,10 +441,10 @@ select_one() {
     done
     ${ALL:-false} && echo "a) all"
     echo "q) to quit"
-
+    
     while true; do
       printf "%s" "$P"
-      set_or_ask "SELECTED" "" ""
+      set_or_ask SELECTED "" ""
       [[ "$SELECTED" == "q" ]] && EXIT_UE "User interrupted"
       [[ ! "$SELECTED" =~ ^[0-9]+$ ]] && continue
       [[ "$SELECTED" -gt 0 && "$SELECTED" -lt "$i" ]] && break

test/integration/test-int-profiles.sh

@@ -10,10 +10,9 @@ test_profile_use() {
   _test_profile.cleanup
 
   ( _IT "should create and use the valid profile"
-  
     ent profile new "$TEST_PROFILE" "$TEST_PROFILE" "$TEST_PROFILE"
 
-    _ASSERT -v current-profile "$(_test_profile.get_current_profile)" = "$TEST_PROFILE"
+    _ASSERT -v current-profile "|$(_test_profile.get_current_profile)|" = "|$TEST_PROFILE|"
 
     ent config TEST_VAR "<BASE>"
     _ASSERT -v TEST_VAR "$(ent config TEST_VAR)" = "<BASE>"
@@ -51,9 +50,12 @@ test_profile_use() {
 }
 
 _test_profile.get_current_profile() {
-  ent status | grep "PROFILE:" | sed 's/.*PROFILE:\s*//'
+  echo "########################################################################" 1>&2
+  ent status 1>&2
+  echo "########################################################################" 1>&2
+  ent status | grep "PROFILE:" | sed 's/.*PROFILE:[[:space:]]*//'
 }
 
 _test_profile.cleanup() {
-  ent profile delete "$TEST_PROFILE" --yes &>/dev/null
+  ent profile delete "$TEST_PROFILE" --yes #&>/dev/null
 }