From 0b610276d1d3aa8e8bb26ecfcff28c629486f8f2 Mon Sep 17 00:00:00 2001 From: timerix Date: Fri, 9 Sep 2022 21:55:20 +0600 Subject: [PATCH] printf --- call_task.sh | 4 ++-- functions.sh | 40 ++++++++++++++++++++-------------------- init.sh | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/call_task.sh b/call_task.sh index b5a5edc..b87c8b7 100644 --- a/call_task.sh +++ b/call_task.sh @@ -2,14 +2,14 @@ tabs 4 TASK=$1 -myprintf "${CYAN}===========[$TASK]===========\n" +printf "${CYAN}===========[$TASK]===========\n" source cbuild/init.sh #pre_build clear_dir $OBJDIR clear_dir $OUTDIR if [ -f "$PRE_BUILD_SCRIPT" ]; then - myprintf "${BLUE}executing $PRE_BUILD_SCRIPT" + printf "${BLUE}executing $PRE_BUILD_SCRIPT" source "$PRE_BUILD_SCRIPT" fi diff --git a/functions.sh b/functions.sh index c79fd68..7262284 100644 --- a/functions.sh +++ b/functions.sh @@ -1,22 +1,22 @@ #!/bin/bash function clear_dir { - myprintf "${BLUE}clearing $1\n" + printf "${BLUE}clearing $1\n" rm -rf $1 mkdir $1 } function compile { local cmp=$1 - myprintf "${BLUE}compiler: ${GRAY}$cmp\n" + printf "${BLUE}compiler: ${GRAY}$cmp\n" local std=$2 - myprintf "${BLUE}standard: ${GRAY}$std\n" + printf "${BLUE}standard: ${GRAY}$std\n" local warn=$3 - myprintf "${BLUE}warnings: ${GRAY}$warn\n" + printf "${BLUE}warnings: ${GRAY}$warn\n" local args=$4 - myprintf "${BLUE}args: ${GRAY}$args\n" + printf "${BLUE}args: ${GRAY}$args\n" local sources=$5 - myprintf "${BLUE}sources: ${GRAY}$sources\n" + printf "${BLUE}sources: ${GRAY}$sources\n" local compilation_error=0 for srcfile in $sources @@ -24,7 +24,7 @@ function compile { local object="$OBJDIR/$(basename $srcfile).o" if ! $($cmp -std=$std $warn $args -c -o $object $srcfile) then - myprintf "${RED}some error happened\n" + printf "${RED}some error happened\n" compilation_error=1 fi ) & done @@ -38,49 +38,49 @@ function compile { # (args, sources) function compile_c { - myprintf "${CYAN}-------------[compile_c]--------------\n" + printf "${CYAN}-------------[compile_c]--------------\n" compile $CMP_C $STD_C "$WARN_C" "$1" "$2" } # (args, sources) function compile_cpp { - myprintf "${CYAN}------------[compile_cpp]-------------\n" + printf "${CYAN}------------[compile_cpp]-------------\n" compile $CMP_CPP $STD_CPP "$WARN_CPP" "$1" "$2" } # (args, outfile) function link { - myprintf "${CYAN}----------------[link]----------------\n" + printf "${CYAN}----------------[link]----------------\n" local args=$1 - myprintf "${BLUE}args: ${GRAY}$args\n" + printf "${BLUE}args: ${GRAY}$args\n" local outfile=$OUTDIR/$2 - myprintf "${BLUE}outfile: ${GRAY}$outfile\n" + printf "${BLUE}outfile: ${GRAY}$outfile\n" local objects="$(find $OBJDIR -name '*.o') $(find $OBJDIR -name '*.a')" - myprintf "${BLUE}objects: ${GRAY}$objects\n" + printf "${BLUE}objects: ${GRAY}$objects\n" if $CMP_CPP $args -o $outfile $(echo $objects | tr '\n' ' ') then - myprintf "${GREEN}file $CYAN$outfile ${GREEN}created\n" + printf "${GREEN}file $CYAN$outfile ${GREEN}created\n" rm -rf $OBJDIR else - myprintf "${RED}some error happened\n" + printf "${RED}some error happened\n" exit 1 fi } # (outfile) function pack_static_lib { - myprintf "${CYAN}----------------[link]----------------\n" + printf "${CYAN}----------------[link]----------------\n" local outfile=$OUTDIR/$1 - myprintf "${BLUE}outfile: ${GRAY}$outfile\n" + printf "${BLUE}outfile: ${GRAY}$outfile\n" local objects="$(find $OBJDIR -name *.o)" - myprintf "${BLUE}objects: ${GRAY}$objects\n" + printf "${BLUE}objects: ${GRAY}$objects\n" if ar rcs $outfile $(echo $objects | tr '\n' ' ') then - myprintf "${GREEN}file $CYAN$outfile ${GREEN}created\n" + printf "${GREEN}file $CYAN$outfile ${GREEN}created\n" rm -rf $OBJDIR else - myprintf "${RED}some error happened\n" + printf "${RED}some error happened\n" exit 1 fi } diff --git a/init.sh b/init.sh index 6ef01cd..af111bf 100644 --- a/init.sh +++ b/init.sh @@ -9,12 +9,12 @@ function create_default_config(){ else cp cbuild/default.config .config fi - myprintf "${YELLOW}Default config created.\nEdit it.\n" + printf "${YELLOW}Default config created.\nEdit it.\n" } #.config if [ ! -f ".config" ]; then - myprintf "${YELLOW}./.config doesn't exist\n" + printf "${YELLOW}./.config doesn't exist\n" create_default_config exit fi @@ -22,9 +22,9 @@ source .config #version check if [ ! $CONFIG_VER -eq 2 ]; then - myprintf "${RED}Your config version isn't correct\n" + printf "${RED}Your config version isn't correct\n" while true; do - myprintf "${WHITE}Backup current config and create default one? (y/n) " + printf "${WHITE}Backup current config and create default one? (y/n) " read answ case $answ in [Yy] ) @@ -32,7 +32,7 @@ if [ ! $CONFIG_VER -eq 2 ]; then create_default_config exit;; [Nn] ) exit;; - * ) myprintf "${RED}incorrect answer\n";; + * ) printf "${RED}incorrect answer\n";; esac done fi