From: Samual Lenks <samual@xonotic.org>
Date: Sun, 29 Dec 2013 10:23:48 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/docs_update'
X-Git-Tag: xonotic-v0.8.0~54
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=491748a8cb340cd7445d06ce60a042fd5de4805b;hp=0804f3eed80cba40d8a7a413da95a5ee70d490c6

Merge remote-tracking branch 'origin/terencehill/docs_update'

# By terencehill
# Via terencehill
* origin/terencehill/docs_update:
  Remove runes/curses bit mask specifications from eventlog.txt
  Update and simplify beginning of section I of mapping.txt
  Remove references to Runematch in mapping.txt
  Document that currently CA can have a more than 2 teams
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index dac31e19..19298c8a 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -333,7 +333,7 @@ case "$cmd" in
 			set -- catchsegv "$@"
 		fi
 		if [ x"$USE_RLWRAP" != x"no" ] && which rlwrap >/dev/null 2>&1; then
-			set -- rlwrap -A -g '^quit' -q "\"" -r -S ']' -w 100 "$@"
+			set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@"
 		fi
 		rm -f xonotic.core
 		"$@" || true
diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh
index 346ff72b..4ef3d030 100755
--- a/xonotic-linux-glx.sh
+++ b/xonotic-linux-glx.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 path=`dirname "${0}"`
-link=`readlink "${0}"`
+link=`readlink -f "${0}"`
 
 [ -n "${link}" ] && path=`dirname "${link}"`
 cd "${path}"