r625 - trunk/code/unix/setup

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2006-03-05 14:12:20 -0500 (Sun, 05 Mar 2006)
New Revision: 625

Modified:
   trunk/code/unix/setup/doit
   trunk/code/unix/setup/setup.xml
Log:
- fix icon
- remove GPL license popup
- make demo script optional


Modified: trunk/code/unix/setup/doit
===================================================================
--- trunk/code/unix/setup/doit	2006-03-05 19:11:19 UTC (rev 624)
+++ trunk/code/unix/setup/doit	2006-03-05 19:12:20 UTC (rev 625)
@@ -28,6 +28,8 @@
 ### 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

Modified: trunk/code/unix/setup/setup.xml
===================================================================
--- trunk/code/unix/setup/setup.xml	2006-03-05 19:11:19 UTC (rev 624)
+++ trunk/code/unix/setup/setup.xml	2006-03-05 19:12:20 UTC (rev 625)
@@ -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>