diff options
| -rwxr-xr-x | code/unix/setup/doit | 4 | ||||
| -rw-r--r-- | code/unix/setup/preuninstall.sh | 4 | ||||
| -rw-r--r-- | code/unix/setup/setup.xml | 34 |
3 files changed, 26 insertions, 16 deletions
diff --git a/code/unix/setup/doit b/code/unix/setup/doit index 30e3503..4086c11 100755 --- a/code/unix/setup/doit +++ b/code/unix/setup/doit @@ -60,10 +60,14 @@ rm -rf image/tmp # patch pk3 files install -m 644 ./idpatchpk3s.tar image/idpatchpk3s.tar +install -m 644 ./idtapatchpk3s.tar image/idtapatchpk3s.tar ### setup.xml sed 's/@VERSION@/'$VERSION'/g' < setup.xml > image/setup.data/setup.xml +### uninstall script +install -m 755 ./preuninstall.sh image/preuninstall.sh + ### start script mkdir -p image/bin/Linux/x86 mkdir -p image/bin/Linux/x86_64 diff --git a/code/unix/setup/preuninstall.sh b/code/unix/setup/preuninstall.sh index f9ad416..ff23010 100644 --- a/code/unix/setup/preuninstall.sh +++ b/code/unix/setup/preuninstall.sh @@ -1,3 +1,3 @@ #!/bin/sh -rm COPYING -rmdir --ignore-fail-on-non-empty demoq3 missionpack +rm -f COPYING +rmdir --ignore-fail-on-non-empty demoq3 missionpack >& /dev/null diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml index f6f80b8..563d8e5 100644 --- a/code/unix/setup/setup.xml +++ b/code/unix/setup/setup.xml @@ -14,13 +14,13 @@ id_patch_pk3s_Q3A_EULA.txt </eula> - <component name="Quake3 Arena gamedata" version="@VERSION@" showname="no" default="yes"> - <option install="true" size="457M"> + <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. </help> - Quake3 Arena gamedata + Copy Quake3 Arena CD data <files cdromid="CD 1" path="baseq3" size="457M"> Quake3/baseq3/pak0.pk3 </files> @@ -35,19 +35,25 @@ </option> </component> - <component name="Quake3 Team Arena gamedata" version="@VERSION@" showname="no" default="yes"> - <option install="true" size="457M"> - <help> - If you don't select this, you must make sure to copy the TA pak0.pk3 to the - missionpack directory manually. - </help> - Quake3 Team Arena gamedata - <files cdromid="CD 2" path="missionpack" size="457M"> - Setup/missionpack/pak0.pk3 + <component name="Quake3 Team Arena gamedata" version="@VERSION@"> + <option> + 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. + </help> + Copy Quake3 Team Arena CD data + <files cdromid="CD 2" path="missionpack" size="457M"> + Setup/missionpack/pak0.pk3 + </files> + </option> </option> </component> - <component arch="x86_64" name="x86_64" version="@VERSION@" showname="no"> + <component arch="x86_64" name="x86_64" version="@VERSION@"> <option arch="x86_64" install="true"> 64 bit binaries <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png" @@ -61,7 +67,7 @@ </option> </component> - <component if="|(x86,x86_64)" name="i386" version="@VERSION@" showname="no"> + <component if="|(x86,x86_64)" name="i386" version="@VERSION@"> <option arch="x86_64" install="true"> 32 bit binaries <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png" |