From cc3892463ac974f26fbe61ab38bc286760eeafa7 Mon Sep 17 00:00:00 2001 From: nemunaire Date: Wed, 22 Feb 2017 03:37:46 +0100 Subject: [PATCH] Compute hint mime type in a variable and display it instead of the hint content --- admin/fill_exercices.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/fill_exercices.sh b/admin/fill_exercices.sh index b57756b6..b6209e45 100755 --- a/admin/fill_exercices.sh +++ b/admin/fill_exercices.sh @@ -203,14 +203,15 @@ do do EXO_HINT=$(get_file "${THM_BASEURI}${EXO_BASEURI}/${HINT}") if [ -n "$EXO_HINT" ]; then - if echo "${EXO_HINT}" | file --mime-type -b - | grep text/ && [ $(echo "${EXO_HINT}" | wc -l) -lt 25 ]; then + EXO_HINT_TYPE=$(echo "${EXO_HINT}" | file --mime-type -b -) + if echo "${EXO_HINT_TYPE}" | grep text/ && [ $(echo "${EXO_HINT}" | wc -l) -lt 25 ]; then HINT_ID=`new_hint "${THEME_ID}" "${EXO_ID}" "Astuce #${HINT_COUNT}" "${EXO_HINT}" "${HINT_COST}"` else HINT_ID=`new_hint "${THEME_ID}" "${EXO_ID}" "Astuce #${HINT_COUNT}" "" "${HINT_COST}" "${THM_BASEURI}${EXO_BASEURI}/${HINT}"` fi if [ -z "$HINT_ID" ]; then - echo -e "\e[31;01m!!! An error occured during hint import!\e[00m (title=Astuce #${HINT_COUNT};content=${EXO_HINT};cost=${HINT_COST})" + echo -e "\e[31;01m!!! An error occured during hint import!\e[00m (title=Astuce #${HINT_COUNT};content::${EXO_HINT_TYPE};cost=${HINT_COST})" else echo -e "\e[32m>>> New hint added:\e[00m $HINT_ID - Astuce #${HINT_COUNT}" fi