aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-09-05 13:24:34 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-09-05 13:24:34 +0000
commit0f2499de05ddd559501c44a2ac4fd6d83f21ddcf (patch)
tree5d633e7c39dcc62a2cc24c1d632c1b4247f97899
parent119e9e35e16a159c93957b12366ad1b4915ab196 (diff)
downloadioquake3-aero-0f2499de05ddd559501c44a2ac4fd6d83f21ddcf.tar.gz
ioquake3-aero-0f2499de05ddd559501c44a2ac4fd6d83f21ddcf.zip
- Remove arch name in resulting file as the file should contain all arches.
- Make sure to delete all files that don't get uninstalled automatically before uninstall process begins. git-svn-id: svn://svn.icculus.org/quake3/trunk@894 edf5b092-35ff-0310-97b2-ce42778d08ea
-rwxr-xr-xcode/unix/setup/doit2
-rw-r--r--code/unix/setup/preuninstall.sh3
-rw-r--r--code/unix/setup/setup.xml3
3 files changed, 6 insertions, 2 deletions
diff --git a/code/unix/setup/doit b/code/unix/setup/doit
index 835ec19..30e3503 100755
--- a/code/unix/setup/doit
+++ b/code/unix/setup/doit
@@ -79,4 +79,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.$arch.run "ioquake3 $VERSION" ./setup.sh
+$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.run "ioquake3 $VERSION" ./setup.sh
diff --git a/code/unix/setup/preuninstall.sh b/code/unix/setup/preuninstall.sh
new file mode 100644
index 0000000..f9ad416
--- /dev/null
+++ b/code/unix/setup/preuninstall.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm COPYING
+rmdir --ignore-fail-on-non-empty demoq3 missionpack
diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml
index 115dbe1..f6f80b8 100644
--- a/code/unix/setup/setup.xml
+++ b/code/unix/setup/setup.xml
@@ -5,7 +5,8 @@
update_url="http://www.icculus.org/quake3/updates.txt"
promptbinaries="yes"
reinstall="yes"
- nopromptoverwrite="yes">
+ nopromptoverwrite="yes"
+ preuninstall="preuninstall.sh">
<readme>
README
</readme>