fix BITH

src/bash/filterTest.sh

@@ -36,22 +36,21 @@
 PRG=$(basename $0)
 
 ATTACH_MODE="FOOTER"
+export SIMULATE=""
 
-BOLD=''
-RED=''
-GREEN=''
-YELLOW=''
-BLUE=''
-MAGENTA=''
-CYAN=''
-NC='' # No Color
+BOLD='\e[1m'
+RED='\e[0;31m'
+GREEN='\e[0;32m'
+YELLOW='\e[0;33m'
+BLUE='\e[0;34m'
+MAGENTA='\e[0;35m'
+CYAN='\e[0;36m'
+NC='\e[0m' # No Color
 NL='
 '
-
-TTY=$(tty)
 ########################################
 LOG () {
-    echo "$1" >> "${TTY}"
+    echo -e "$1" 1>&2
 }
 
 usage () {
@@ -64,6 +63,7 @@ while : ; do
 	-h*) usage;;
 	-v*) "${eMailShrinker}" -v; exit;;
 	-g) DEBUG="-g"; shift;;
+	-s) SIMULATE="echo"; shift;;
 	-m) shift; ATTACH_MODE="$1"; shift;;
 	*) break;;
     esac
@@ -83,11 +83,11 @@ mbox=$(realpath "$1")
 cd $(dirname $0)
 eMailShrinker="$(realpath "./eMailShrinker")"
 [ -x "${eMailShrinker}" ] || eMailShrinker="$(realpath "../../build/out/eMailShrinker")"
-[ -x "${eMailShrinker}" ] || ( echo "${RED}eMailShrinker not found${NC}" ; exit)
+[ -x "${eMailShrinker}" ] || ( echo -e "${RED}eMailShrinker not found${NC}" ; exit)
 
 ########################################
 dos2unix "${mbox}"
-DOMAINNAME="$(cat domainname)"
+[ -z "${SIMULATE}" ] && DOMAINNAME="$(cat domainname)"
 JIRAFEAU_URL="https://depot.${DOMAINNAME}"
 JIRAFEAU_LOCAL="${JIRAFEAU_URL}"
 
@@ -99,8 +99,7 @@ curlJirafeauUpdate () {
     # $1: periode
     # $2: jirafeauItemRef
 
-    curl -X POST -d "u=$1" -d "h=$2" "${JIRAFEAU_LOCAL}/a.php"
-    #"${jirafeauAPI}" -f "${JIRAFEAU_LOCAL}" -t "$1" update "$2"
+    [ -z "${SIMULATE}" ] && curl -X POST -d "u=$1" -d "h=$2" "${JIRAFEAU_LOCAL}/a.php"
 }
 
 curlJirafeauSend () {
@@ -110,11 +109,14 @@ curlJirafeauSend () {
     # $4: name
     # $5: password
 
-    type=$3
-    [ -z "${type}" ] && type="text/plain"
-    LOG "curl -X POST -F \"time=$1\" -F \"key=$5\" -F \"file=@$2;type=${type};filename=\\\"$4\\\"\" \"${JIRAFEAU_LOCAL}/a.php\""
-    curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=${type};filename=\"$4\"" "${JIRAFEAU_LOCAL}/a.php" || exit 1
-    #"${jirafeauAPI}" -f "${JIRAFEAU_LOCAL}" -t "$1" -s "1Gi" -c "${type}" -n "$4" send "$2" "$5"
+    if [ -n "${SIMULATE}" ]; then
+	echo -e "TokenXXX\nCodeX"
+	return
+    fi
+    type="type=$3;"
+    [ -z "$3" -o "$3" = "/" ] && type=""
+    LOG "curl -X POST -F \"time=$1\" -F \"key=$5\" -F \"file=@$2;${type}filename=\\\"$4\\\"\" \"${JIRAFEAU_LOCAL}/a.php\""
+    curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;${type}filename=\"$4\"" "${JIRAFEAU_LOCAL}/a.php" || exit 1
 }
 
 ########################################
@@ -126,19 +128,18 @@ echo -e "time: $(date "+%Y-%m-%d-%H:%M:%S")\nid: $(date +%s)" > "${TMP_DIR}/arch
 
 ########################################
 # affichage de la structure de départ
-LOG "  - ${BLUE}mbox: ${mbox}${NC}"
+LOG "  - ${BLUE}mbox: ${mbox}${NC}${YELLOW}"
 "${eMailShrinker}" -l "${mbox}"
-LOG
+LOG "${NC}"
 
 ########################################
 # recherche des prolongations des délais de grace
-"${eMailShrinker}" ${DEBUG} -u "${mbox}" > "${TMP_DIR}/url-to-refresh.txt" 2>> "${TTY}"
+"${eMailShrinker}" ${DEBUG} -u "${mbox}" > "${TMP_DIR}/url-to-refresh.txt"
 cat "${TMP_DIR}/url-to-refresh.txt" | grep "${JIRAFEAU_URL}" | while read REMOTE_LINK; do
     REMOTE_REF=$(echo "${REMOTE_LINK}" | sed -e 's/.*h=\([^&]*\).*/\1/' -e 's/.*http.*//')
     [ -z "${REMOTE_REF}" ] && continue
     LOG "  - ${BLUE}update ${REMOTE_REF}${NC}"
-    curlJirafeauUpdate "month" "${REMOTE_REF}" 2>> "${TTY}"
-    LOG
+    curlJirafeauUpdate "month" "${REMOTE_REF}"
     echo "old: ${REMOTE_REF} ${REMOTE_KEY}" >> "${TMP_DIR}/archive-content.txt"
 done
 
@@ -167,7 +168,7 @@ cat "${TMP_DIR}/PJ-name.txt" | {
 	LOG " - ${BLUE}find ${ATTACH_NAME} / (${ATTACH_CONTENT_TYPE}) / ${ATTACH_MEDIA} ${NC}"
 	PASSWORD=$(apg -n 1 -m 12 -M cln)
 	PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \  -f 1)
-	curlJirafeauSend "month" "${ATTACH_MEDIA}" "${ATTACH_CONTENT_TYPE}" "${ATTACH_NAME}" "${PASSWORD}"  2>> "${TTY}" > "${TMP_DIR}/one.txt"
+	curlJirafeauSend "month" "${ATTACH_MEDIA}" "${ATTACH_CONTENT_TYPE}" "${ATTACH_NAME}" "${PASSWORD}" > "${TMP_DIR}/one.txt"
 
 	cat "${TMP_DIR}/one.txt"  | {
 	    read JIR_TOKEN
@@ -175,7 +176,7 @@ cat "${TMP_DIR}/PJ-name.txt" | {
 	    case "${JIR_TOKEN}" in
 		"" | no | *Error* | \<* )
 		    LOG "  - ${RED}can't upload ${ATTACH_MEDIA} <${JIR_TOKEN}> <${JIR_CODE}>${NC}"
-		    cat "${TMP_DIR}/one.txt" >> "${TTY}"
+		    cat "${TMP_DIR}/one.txt" >&2
 		    echo "url:"
 		    exit 1
 		    ;;
@@ -191,7 +192,7 @@ cat "${TMP_DIR}/PJ-name.txt" | {
     if [ "${NB_ATTACH}" -gt 1 ]; then
 	PASSWORD=$(apg -n 1 -m 12 -M cln)
 	PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \  -f 1)
-	curlJirafeauSend "month" "${TMP_DIR}/archive-content.txt" "text/kaz_email_archive" "archive_content" "${PASSWORD}"  2>> "${TTY}" > "${TMP_DIR}/one.txt" || exit 1
+	curlJirafeauSend "month" "${TMP_DIR}/archive-content.txt" "text/kaz_email_archive" "archive_content" "${PASSWORD}" > "${TMP_DIR}/one.txt" || exit 1
 	cat "${TMP_DIR}/one.txt"  | {
 	    read JIR_TOKEN
 	    read JIR_CODE
@@ -221,12 +222,12 @@ LOG "  - ${GREEN}ATTACH_MODE: ${ATTACH_MODE}${NC}"
 
 ########################################
 # substitution des pièces jointes par les codes fournis par jirafeau
-cat "${TMP_DIR}/PJ-Keys.txt" | "${eMailShrinker}" ${DEBUG} ${ATTACH_MODE} -s "5ki" "${mbox}" "${TMP_DIR}/new-mbox" 2>> "${TTY}" || exit 1
+cat "${TMP_DIR}/PJ-Keys.txt" | "${eMailShrinker}" ${DEBUG} ${ATTACH_MODE} -s "5ki" "${mbox}" "${TMP_DIR}/new-mbox" || exit 1
 
 ########################################
 # affichage de la structure à la fin
-LOG "  - ${BLUE}new-mbox:${NC}"
-"${eMailShrinker}" -l "${TMP_DIR}/new-mbox" 2>> "${TTY}" || exit 1
+LOG "  - ${BLUE}new-mbox:${NC}${YELLOW}"
+"${eMailShrinker}" -l "${TMP_DIR}/new-mbox" || ( LOG "${NC}" ; exit 1)
 
-echo -e "\nresul in ${TMP_DIR}/new-mbox"
+echo -e "\n${NC}${GREEN}${BOLD}resul in ${TMP_DIR}/new-mbox${NC}"
 exit 0