From 3f80b89a4cf143b3c860c4e69966e1f00d330926 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 14 Jan 2017 14:58:40 +0100 Subject: [PATCH] fill_exercices: flags.txt files can use tabulation char as separator instead of : --- admin/fill_exercices.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/admin/fill_exercices.sh b/admin/fill_exercices.sh index 245a45f2..149fad64 100755 --- a/admin/fill_exercices.sh +++ b/admin/fill_exercices.sh @@ -169,8 +169,13 @@ do do [ -z "${KEYLINE}" ] && continue - KEY_NAME=$(echo "$KEYLINE" | cut -d : -f 1) - KEY_RAW=$(echo "$KEYLINE" | cut -d : -f 2-) + KEY_NAME=$(echo "$KEYLINE" | cut -d$'\t' -f 1) + KEY_RAW=$(echo "$KEYLINE" | cut -d$'\t' -f 2-) + + if [ -z "${KEY_RAW}" ] || [ "${KEY_NAME}" = "${KEY_RAW}" ]; then + KEY_NAME=$(echo "$KEYLINE" | cut -d : -f 1) + KEY_RAW=$(echo "$KEYLINE" | cut -d : -f 2-) + fi if [ -z "${KEY_NAME}" ]; then KEY_NAME="Flag"