X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tools%2Fupload_supertux_wiki.sh;h=b7e5f38f75eab53237873eb56075e2d1bd5593ff;hb=HEAD;hp=9fc6254ad59955c5b33c4355dd19286d83da4a82;hpb=61999f475a6af79c94ff56331687b2388adb022b;p=supertux.git

diff --git a/tools/upload_supertux_wiki.sh b/tools/upload_supertux_wiki.sh
index 9fc6254ad..b7e5f38f7 100755
--- a/tools/upload_supertux_wiki.sh
+++ b/tools/upload_supertux_wiki.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # This is a little Shell Script that allows you to upload files to the
 # SuperTux MediaWiki. To use it to create a file ~/.supertux-wiki.sh
@@ -15,26 +15,26 @@
 set -e
 
 function rc_error() {
-    echo "Create a file ~/.supertux-wiki.sh with the following syntax: "
-    echo ""
-    echo "WIKI_USERNAME=your_username"
-    echo "WIKI_PASSWORD=your_password"
-    echo ""
-    exit 1;
+	echo "Create a file ~/.supertux-wiki.sh with the following syntax: "
+	echo ""
+	echo "WIKI_USERNAME=\"your_username\""
+	echo "WIKI_PASSWORD=\"your_password\""
+	echo ""
+	exit 1;
 }
 
 if [ ! -f ~/.supertux-wiki.sh ]; then
-    echo "Error: Couldn't find ~/.supertux-wiki.sh"
-    echo ""
-    rc_error
+	echo "Error: Couldn't find ~/.supertux-wiki.sh"
+	echo ""
+	rc_error
 fi
 
-source ~/.supertux-wiki.sh
+source "$HOME/.supertux-wiki.sh"
 
 if [ -z "$WIKI_PASSWORD" -o -z "$WIKI_USERNAME" ]; then
-    echo "Error: WIKI_PASSWORD or WIKI_USERNAME not set"
-    echo ""
-    rc_error
+	echo "Error: WIKI_PASSWORD or WIKI_USERNAME not set"
+	echo ""
+	rc_error
 fi
 
 usage="\
@@ -44,23 +44,23 @@ Usage: $0 [OPTIONS] FILENAME DESCRIPTION
 "
 
 if [ ! $# -eq 2 ]; then
-    if [ $# -eq 3 -a "x$1" = "x--overwrite" ]; then
-        FILENAME="$2"
-        DESCRIPTION="$3"
-        IGNORE_WARNING="-F wpIgnoreWarning=1"
-    else
-      echo "${usage}" 1>&2
-      exit 1
-    fi
+	if [ $# -eq 3 -a "x$1" = "x--overwrite" ]; then
+		FILENAME="$2"
+		DESCRIPTION="$3"
+		IGNORE_WARNING="-F wpIgnoreWarning=1"
+	else
+		echo "${usage}" 1>&2
+		exit 1
+	fi
 else
-    FILENAME="$1"
-    DESCRIPTION="$2"
-    IGNORE_WARNING=""
+	FILENAME="$1"
+	DESCRIPTION="$2"
+	IGNORE_WARNING=""
 fi
 
 if [ ! -r "$FILENAME" ]; then
-    echo "Error: Can't read $FILENAME"
-    exit 1
+	echo "Error: Can't read $FILENAME"
+	exit 1
 fi
 
 # MD5SUM=`md5sum "$1" | cut -c "1-32"`
@@ -71,33 +71,40 @@ STEP2_FILE="`tempfile`"
 COOKIES_FILE="`tempfile`"
 
 curl \
- -c "$COOKIES_FILE" \
- -F "wpName=$WIKI_USERNAME"        \
- -F "wpPassword=$WIKI_PASSWORD"    \
- -F "wpLoginattempt=Log in" \
- "http://supertux.berlios.de/wiki/index.php?title=Special:Userlogin&action=submitlogin&returnto=Main_Page" > $STEP1_FILE
+	-c "$COOKIES_FILE" \
+	-F "wpName=$WIKI_USERNAME" \
+	-F "wpPassword=$WIKI_PASSWORD" \
+	-F "wpLoginattempt=Log in" \
+	"http://supertux.lethargik.org/wiki/index.php?title=Special:Userlogin&action=submitlogin&returnto=Main_Page" > "$STEP1_FILE"
 
 curl \
- -b "${COOKIES_FILE}" \
- -F "wpUploadFile=@${FILENAME}" \
- -F "wpUploadDescription='${DESCRIPTION}'"  \
- -F "wpUploadAffirm=1" \
- -F "wpUpload='Upload file'" \
- $IGNORE_WARNING \
- "http://supertux.berlios.de/wiki/index.php/Special:Upload" > $STEP2_FILE
+	-b "${COOKIES_FILE}" \
+	-F "wpUploadFile=@${FILENAME}" \
+	-F "wpUploadDescription=${DESCRIPTION}" \
+	-F "wpUploadAffirm=1" \
+	-F "wpUpload='Upload file'" \
+	$IGNORE_WARNING \
+	"http://supertux.lethargik.org/wiki/Special:Upload" > "$STEP2_FILE"
 
 echo "------------------------------------------------------------------------"
 
-links -dump $STEP2_FILE  | sed "s/ *Views/## EOF ##/;/## EOF ##/q"
+# links -dump $STEP2_FILE | sed "s/ *Views/## EOF ##/;/## EOF ##/q"
+links -dump $STEP2_FILE
 
 rm -f "$STEP1_FILE" "$STEP2_FILE" "$COOKIES_FILE"
 
+WIKI_FILENAME="$(basename "$FILENAME" | sed -n "s/^\(.\).*/\1/p" | tr '[a-z]' '[A-Z]')$(basename "$FILENAME" | sed "s/^.\(.*\)/\1/")"
+
 echo ""
 echo "Link to the Image list:"
-echo "  http://supertux.berlios.de/wiki/index.php/Special:Imagelist"
+echo "  http://supertux.lethargik.org/wiki/index.php/Special:Imagelist"
 echo " "
-echo "Link to the Image page:" 
-echo "  http://supertux.berlios.de/wiki/index.php/Image:"`basename $FILENAME | sed -n "s/^\(.\).*/\1/p" | tr '[a-z]' '[A-Z]'``basename $FILENAME | sed "s/^.\(.*\)/\1/"`
+echo "Link to the Image page:"
+echo "  http://supertux.lethargik.org/wiki/index.php/Image:${WIKI_FILENAME}"
+echo ""
+echo "Wiki Link (first without thumbnail, second with):"
+echo "  [[:Image:$WIKI_FILENAME|$DESCRIPTION]]"
+echo "  [[Image:$WIKI_FILENAME|$DESCRIPTION]]"
 echo ""
 
 # EOF #