From aa5ae1824db35d49007fbfb9b8f03d25bcd54afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 15 Apr 2022 11:11:44 +0200 Subject: [PATCH] log --- Makefile | 4 ++-- src/bash/filter.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c96a5d0..df74031 100644 --- a/Makefile +++ b/Makefile @@ -58,8 +58,8 @@ JIR_OUT = $(patsubst %, $(OUT_DIR)/%, $(JIR_PRG)) ## FLAGS ############################### -DFLAGS = -O2 -DDISABLE_LOG -#DFLAGS = -g -Wall +#DFLAGS = -O2 -DDISABLE_LOG +DFLAGS = -g -Wall IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR) -std=c++11 diff --git a/src/bash/filter.sh b/src/bash/filter.sh index 0113041..10de3aa 100644 --- a/src/bash/filter.sh +++ b/src/bash/filter.sh @@ -184,7 +184,7 @@ LOG_FIC "${CYAN}${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${IN LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}" case "${JIR_TOKEN}" in "" | no | *Error* | \<* ) - LOG_FIC " - ${RED}Can't upload <${ATTACH_NAME}> <${ATTACH_CONTENT_TYPE}> <$(wc -c < "${ATTACH_MEDIA}")> (${JIR_TOKEN}). It will be not change in e-mail.${NC}" + LOG_FIC " - ${RED}Can't upload <${ATTACH_NAME}> <${ATTACH_CONTENT_TYPE}> <$(wc -c < "${ATTACH_MEDIA}")> (${JIR_TOKEN}) . It will be not change in e-mail.${NC}" echo "new:" cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.bak" echo "UPLOAD_FAIL" >> "${JIRAFEAU_ERROR}" @@ -214,8 +214,9 @@ LOG_FIC "${CYAN}${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${IN LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}" case "${JIR_TOKEN}" in "" | no | *Error* | \<* ) - LOG_FIC " - ${RED}can't upload archive (${JIR_TOKEN}), substitution couldn't be done${NC}" + LOG_FIC " - ${RED}can't upload archive (${JIR_TOKEN}) , substitution couldn't be done${NC}" echo "arch: bad" + cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.bak" echo "ARCHIVE_FAIL" >> "${JIRAFEAU_ERROR}" ;; * )