From e655f05da608e0c8fe0a5cf6918036ac9378c124 Mon Sep 17 00:00:00 2001 From: Timerix Date: Wed, 12 Nov 2025 14:33:22 +0500 Subject: [PATCH] stopped writing {GRAY} before each message in myprint() --- cbuild.sh | 4 ++-- include/detect_os.sh | 1 - include/functions.sh | 8 ++++++-- include/myprint.sh | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cbuild.sh b/cbuild.sh index 2ec8b16..532026e 100755 --- a/cbuild.sh +++ b/cbuild.sh @@ -45,7 +45,7 @@ include "@cbuild/include/functions.sh" include "@cbuild/include/config.sh" function print_help { - myprint "cbuild v$INSTALLED_CBUILD_VERSION" + myprint "${GRAY}cbuild v$INSTALLED_CBUILD_VERSION" myprint "C/C++ project build system written in bash." myprint "Usage: cbuild [OPTIONS] [TASKS]" myprint "Options:" @@ -74,7 +74,7 @@ do exit 0 ;; '-v' | '--version') - myprint "cbuild v$INSTALLED_CBUILD_VERSION" + myprint "${GRAY}cbuild v$INSTALLED_CBUILD_VERSION" exit 0 ;; '-c' | '--config') diff --git a/include/detect_os.sh b/include/detect_os.sh index 22282bf..fb49e33 100755 --- a/include/detect_os.sh +++ b/include/detect_os.sh @@ -4,7 +4,6 @@ include "@cbuild/include/myprint.sh" function detect_os { local uname_result="$(uname -o)" - # myprint "uname result: '$uname_result'" case "$uname_result" in Msys | Cygwin | MS/Windows) safeprint WINDOWS diff --git a/include/functions.sh b/include/functions.sh index cb514f4..fb10d80 100755 --- a/include/functions.sh +++ b/include/functions.sh @@ -233,7 +233,9 @@ function pack_static_lib { fi local command="ar rcs $OUTDIR/$outfile $objects" - myprint "$command" + print_hline "${GRAY}" "─" + myprint "${GRAY}$command" + print_hline "${GRAY}" "─" if $command then myprint "${GREEN}file $CYAN$outfile ${GREEN}created" @@ -268,7 +270,9 @@ function link { done local command="$CMP_CPP $objects $static_libs $args $dynamic_libs_args -o $OUTDIR/$outfile" - myprint "$command" + print_hline "${GRAY}" "─" + myprint "${GRAY}$command" + print_hline "${GRAY}" "─" if $command then myprint "${GREEN}file $CYAN$outfile ${GREEN}created" diff --git a/include/myprint.sh b/include/myprint.sh index 89beebd..a792971 100755 --- a/include/myprint.sh +++ b/include/myprint.sh @@ -18,7 +18,7 @@ function safeprint { # prints text with special characters and resets color function myprint { - printf "${GRAY}$@${GRAY}\n" + printf "$@${GRAY}\n" } function myprint_quiet {