board-status: update mediawiki interface
Our Mediawiki instance doesn't accept the old txt format anymore.
Change-Id: I94b9f5366900ec8e192abab3ed716dbced4fc4f7
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/8567
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/util/board_status/to-wiki/push-to-wiki.sh b/util/board_status/to-wiki/push-to-wiki.sh
index ad33993..7c67726 100755
--- a/util/board_status/to-wiki/push-to-wiki.sh
+++ b/util/board_status/to-wiki/push-to-wiki.sh
@@ -22,12 +22,10 @@
--compressed \
--data-urlencode "lgname=${USERNAME}" \
--data-urlencode "lgpassword=${USERPASS}" \
- --request "POST" "${WIKIAPI}?action=login&format=txt")
+ --request "POST" "${WIKIAPI}?action=login&format=json")
-CR2=($CR)
-if [ "${CR2[9]}" = "[token]" ]; then
- TOKEN=${CR2[11]}
-else
+TOKEN=`echo $CR| sed -e 's,^.*"token":"\([^"]*\)".*$,\1,'`
+if [ -z "$TOKEN" ]; then
exit
fi
@@ -44,7 +42,7 @@
--data-urlencode "lgname=${USERNAME}" \
--data-urlencode "lgpassword=${USERPASS}" \
--data-urlencode "lgtoken=${TOKEN}" \
- --request "POST" "${WIKIAPI}?action=login&format=txt")
+ --request "POST" "${WIKIAPI}?action=login&format=json")
###############
#Get edit token
@@ -57,10 +55,10 @@
--header "Accept-Language: en-us" \
--header "Connection: keep-alive" \
--compressed \
- --request "POST" "${WIKIAPI}?action=tokens&format=txt")
+ --request "POST" "${WIKIAPI}?action=query&meta=tokens&format=json")
-CR2=($CR)
-EDITTOKEN=${CR2[8]}
+EDITTOKEN=`echo $CR| sed -e 's,^.*"csrftoken":"\([^"]*\)".*$,\1,'`
+EDITTOKEN=`printf "$EDITTOKEN"`
if [ ${#EDITTOKEN} != 34 ]; then
exit
fi