From 5d118e434f4a9583c19c2b151154eced842ec573 Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Tue, 5 Sep 2006 14:29:07 +0000
Subject: [PATCH] Fix a few text related bugs in the installer.

---
 code/unix/setup/doit      | 2 +-
 code/unix/setup/setup.xml | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/unix/setup/doit b/code/unix/setup/doit
index 4086c11e..2bf6176c 100755
--- a/code/unix/setup/doit
+++ b/code/unix/setup/doit
@@ -83,4 +83,4 @@ install -m 644 ../../../COPYING.txt image/COPYING
 install -m 644 ./id_patch_pk3s_Q3A_EULA.txt image/id_patch_pk3s_Q3A_EULA.txt
 
 ### makeself installer
-$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.run "ioquake3 $VERSION" ./setup.sh
+$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.run "ioquake3 $VERSION-$RELEASE" ./setup.sh
diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml
index 563d8e54..89e355db 100644
--- a/code/unix/setup/setup.xml
+++ b/code/unix/setup/setup.xml
@@ -17,8 +17,7 @@
   <component name="Quake3 Arena gamedata" version="@VERSION@" default="yes">
    <option size="457M">
      <help>
-       If you don't select this, you must make sure to copy pak0.pk3 to the
-       baseq3 directory manually.
+       If you don't select this, you must make sure to copy pak0.pk3 to the baseq3 directory manually.
      </help>
      Copy Quake3 Arena CD data
      <files cdromid="CD 1" path="baseq3" size="457M">
@@ -37,14 +36,13 @@
 
   <component name="Quake3 Team Arena gamedata" version="@VERSION@">
    <option>
-     Install Team Arena components.
+     Install Team Arena components
      <files path="missionpack">
        idtapatchpk3s.tar
      </files>
      <option size="457M">
        <help>
-         If you don't select this, you must make sure to copy the TA pak0.pk3 to the
-         missionpack directory manually.
+         If you don't select this, you must make sure to copy the TA pak0.pk3 to the missionpack directory manually.
        </help>
        Copy Quake3 Team Arena CD data
        <files cdromid="CD 2" path="missionpack" size="457M">