- fix icon

- remove GPL license popup
- make demo script optional


git-svn-id: svn://svn.icculus.org/quake3/trunk@625 edf5b092-35ff-0310-97b2-ce42778d08ea

2 files changed, 13 insertions, 6 deletions

diff --git a/code/unix/setup/doit b/code/unix/setup/doit
index 92585e2..4a8ff0a 100755
--- a/code/unix/setup/doit
+++ b/code/unix/setup/doit
@@ -28,6 +28,8 @@ cp -a $SETUPIMAGE/{setup.data,setup.sh} image/
 ### splash
 rm -f image/setup.data/splash.xpm
 [ -e splash.xpm ] && cp splash.xpm image/setup.data/splash.xpm
+rm -f image/quake3.png
+cp ../quake3.png image/quake3.png
 
 ### binaries
 mkdir image/tmp
diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml
index 172b933..017c888 100644
--- a/code/unix/setup/setup.xml
+++ b/code/unix/setup/setup.xml
@@ -6,25 +6,30 @@
   <readme>
     README
   </readme>
+<!--
   <eula>
    COPYING
   </eula>
+-->
   <component name="Default" version="@VERSION@" default="yes">
    <option install="true" required="true">
     Quake 3
 
-    <binary arch="any" libc="any" symlink="ioquake3" icon="icon.xpm" play="yes"
+    <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png" play="yes"
 	    name="icculus.org/quake3">
       ioquake3
     </binary>
-    <binary arch="any" libc="any" symlink="ioq3demo" icon="icon.xpm" play="no"
-	    name="icculus.org/quake3 (Demo)">
-      ioq3demo
-    </binary>
     <files>
       ioquake3.tar
-      icon.xpm
+      quake3.png
     </files>
    </option>
+   <option install="false" required="false">
+    Quake 3 Demo start script
+    <binary arch="any" libc="any" symlink="ioq3demo" icon="quake3.png" play="no"
+	    name="icculus.org/quake3 (Demo)">
+      ioq3demo
+    </binary>
+   </option>
   </component>
 </install>