From a245ca4181712b34b5f0b9e640f64e2012cb418d Mon Sep 17 00:00:00 2001 From: "Steven A. Broderick Elias" Date: Thu, 7 Sep 2023 10:08:55 -0400 Subject: [PATCH] Add raw log mode --- .../learn/quickstarts/network/miniziti.bash | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/docusaurus/docs/learn/quickstarts/network/miniziti.bash b/docusaurus/docs/learn/quickstarts/network/miniziti.bash index 394e2fa71..acb2c5cda 100644 --- a/docusaurus/docs/learn/quickstarts/network/miniziti.bash +++ b/docusaurus/docs/learn/quickstarts/network/miniziti.bash @@ -210,16 +210,30 @@ miniziti_login() { logger() { local caller="${FUNCNAME[1]}" + if (( $# < 1 )); then echo "ERROR: $caller() takes 1 or more args" >&2 return 1 fi + local message="$*" + + if [[ "$message" =~ ^r\'(.+)\'$ ]]; then + raw_message="${BASH_REMATCH[1]}" + message="$raw_message" + fi + caller_level="${caller##log}" if (( MINIZITI_DEBUG )); then - echo -e "${caller_level^^} ${FUNCNAME[2]}:${BASH_LINENO[1]}: $*" + line="${caller_level^^} ${FUNCNAME[2]}:${BASH_LINENO[1]}: $message" else - echo -e "${caller_level^^} $*" + line="${caller_level^^} $message" + fi + + if [[ -n "${raw_message-}" ]]; then + echo -E "${line}" + else + echo -e "${line}" fi } @@ -882,7 +896,7 @@ main(){ showAdminCreds echo -e "\n\n" - logInfo "Success! Remember to add your edge client identity '$(pathToNative "$CLIENT_OTT")' in your tunneler, e.g. Ziti Desktop Edge." + logInfo "r'Success! Remember to add your edge client identity '$(pathToNative "$CLIENT_OTT")' in your tunneler, e.g. Ziti Desktop Edge.'" } main "$@"