From 085d25c064164edeeb036361a38d0ff4eff0ec45 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Fri, 30 Dec 2016 20:35:36 +0100 Subject: [PATCH] admin: various fixes in fill_exercices --- admin/fill_exercices.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/fill_exercices.sh b/admin/fill_exercices.sh index 2f9c5564..2169bf5a 100755 --- a/admin/fill_exercices.sh +++ b/admin/fill_exercices.sh @@ -61,7 +61,7 @@ new_key() { THEME="$1" EXERCICE="$2" TYPE="$3" - KEY=`echo $4 | sed 's/"/\\\\"/g' | sed 's#\\\\#\\\\\\\\#g'` + KEY=`echo $4 | sed 's#\\\\#\\\\\\\\#g' | sed 's/"/\\\\"/g'` curl -f -s -d "{\"type\": \"$TYPE\", \"key\": \"$KEY\"}" "${BASEURL}/api/themes/$THEME/exercices/$EXERCICE/keys" | grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+" @@ -80,6 +80,7 @@ get_file_from_cloud() { } get_file() { cat "${BASEFILE}$1" 2> /dev/null | tr -d '\r' + echo } #alias get_file=get_file_from_cloud @@ -98,7 +99,7 @@ unhtmlentities() { do THM_BASEURI="/${THEME_URI}/" THEME_NAME=$(echo "${THEME_URI#*-}" | unhtmlentities) - THEME_AUTHORS=$(get_file "${THM_BASEURI}/AUTHORS.txt" | sed 's/$/, /' | tr -d '\n' | sed 's/, $//') + THEME_AUTHORS=$(get_file "${THM_BASEURI}/AUTHORS.txt" | sed '/^$/d;s/$/, /' | tr -d '\n' | sed 's/, $//') THEME_ID=`new_theme "$THEME_NAME" "$THEME_AUTHORS"` if [ -z "$THEME_ID" ]; then echo -e "\e[31;01m!!! An error occured during theme add\e[00m" @@ -132,7 +133,7 @@ do EXO_BASEURI="${EXO_URI}/" - EXO_VIDEO=$(get_dir "${THM_BASEURI}${EXO_BASEURI}/resolution/" | grep -E "\.(mov|mkv|mp4|avi|flv|ogv|webm)$" | while read f; do basename $f; done | tail -1) + EXO_VIDEO=$(get_dir "${THM_BASEURI}${EXO_BASEURI}/resolution/" | grep -E "\.(mov|mkv|mp4|avi|flv|ogv|webm)$" | while read f; do basename "$f"; done | tail -1) [ -n "$EXO_VIDEO" ] && EXO_VIDEO="/resolution${THM_BASEURI}${EXO_BASEURI}resolution/${EXO_VIDEO}" if [ "${LAST}" = "null" ]; then @@ -158,6 +159,8 @@ do # Keys get_file "${THM_BASEURI}${EXO_BASEURI}/flags.txt" | while read KEYLINE do + [ -z "${KEYLINE}" ] && continue + KEY_NAME=$(echo "$KEYLINE" | cut -d : -f 1) KEY_RAW=$(echo "$KEYLINE" | cut -d : -f 2-)