Merged with latest from upstream.

8 files changed, 82 insertions, 118 deletions

diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh
index c8f3d36..f37e173 100755
--- a/pst/install-2cd-extra.sh
+++ b/pst/install-2cd-extra.sh
@@ -1,5 +1,20 @@
 #!/bin/sh
-# Installs Planescape Torment 2CD version extras
+# Copyright 2009 Nick White
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# See <http://www.gnu.org/licenses/> for a copy of the GNU General
+# Public License.
+#
+# Extra Planescape: Torment (2CD version) content (so CDs aren't needed)
 
 scriptdir="$(dirname $0)"/..
 source "$scriptdir/includes/generic-includes.sh"
diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh
index fc5dc4a..61ff812 100755
--- a/pst/install-2cd-minimal.sh
+++ b/pst/install-2cd-minimal.sh
@@ -1,7 +1,20 @@
 #!/bin/sh
-# Installs Planescape Torment 2CD version minimal
-
-FULLGAMENAME="Planescape Torment: 2CD version"
+# Copyright 2009 Nick White
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# See <http://www.gnu.org/licenses/> for a copy of the GNU General
+# Public License.
+#
+# Planescape: Torment (2CD version) minimal
 
 scriptdir="$(dirname $0)"/..
 source "$scriptdir/includes/generic-includes.sh"
diff --git a/pst/install-4cd-extra.sh b/pst/install-4cd-extra.sh
index 23dee20..f66c79e 100755
--- a/pst/install-4cd-extra.sh
+++ b/pst/install-4cd-extra.sh
@@ -1,5 +1,20 @@
 #!/bin/sh
-# Installs Planescape Torment 4CD version extras
+# Copyright 2009 Nick White
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# See <http://www.gnu.org/licenses/> for a copy of the GNU General
+# Public License.
+#
+# Extra Planescape: Torment (4CD version) content (so CDs aren't needed)
 
 scriptdir="$(dirname $0)"/..
 source "$scriptdir/includes/generic-includes.sh"
diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh
index 0401e32..09cd175 100755
--- a/pst/install-4cd-minimal.sh
+++ b/pst/install-4cd-minimal.sh
@@ -1,7 +1,20 @@
 #!/bin/sh
-# Installs Planescape Torment 4CD version minimal
-
-FULLGAMENAME="Planescape Torment: 4CD version"
+# Copyright 2009 Nick White
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# See <http://www.gnu.org/licenses/> for a copy of the GNU General
+# Public License.
+#
+# Installs Planescape: Torment (4CD version) minimal
 
 scriptdir="$(dirname $0)"/..
 source "$scriptdir/includes/generic-includes.sh"
diff --git a/pst/install-patch-fixpack.sh b/pst/install-patch-fixpack.sh
deleted file mode 100755
index 6630023..0000000
--- a/pst/install-patch-fixpack.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Planescape: Torment Ultimate Weidu Fixpack
-
-scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/patch-includes.sh"
-
-parseargs "$@"
-
-checkforbin WeiDU unrar
-
-setuptmp
-
-if [ ! -f "$PATCHDIR/pstfixpack.rar" ]; then
-	echo "You need to download the fixpack from http://dl.spellholdstudios.net/pst-fixpack" 1>&2
-	echo "and put it in $PATCHDIR to install this patch" 1>&2
-	exit
-fi
-
-unrar x -o+ -cl "$PATCHDIR/pstfixpack.rar" "$TARGETDIR" || die
-rm "$TARGETDIR/setup-pst-fix.exe"
-cd "$TARGETDIR"
-
-case "$LANGUAGE" in
-	"German" ) langno=1 ;;
-	"Spanish" ) langno=2 ;;
-	"Italian" ) langno=3 ;;
-	* ) langno=0 ;;
-esac
-
-# echo to install all manually as --yes assumes English
-echo -e "${langno}\nn\ni\ni\ni\n\n" \
-| WeiDU --continue setup-pst-fix.tp2 || die
-
-setperms "$TARGETDIR"
diff --git a/pst/install-patch-official.sh b/pst/install-patch-official.sh
index 485fad1..5a9b200 100755
--- a/pst/install-patch-official.sh
+++ b/pst/install-patch-official.sh
@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright 2009 Nick White
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# See <http://www.gnu.org/licenses/> for a copy of the GNU General
+# Public License.
+#
 # Planescape: Torment official patch
 
 scriptdir="$(dirname $0)"/..
@@ -13,10 +28,10 @@ setuptmp
 
 getpatch http://www.sorcerers.net/Games2/Torment/Trmt11.exe
 
-cabextract -L $TMPDIR/Trmt11.exe -d $TMPDIR || die
-unshield -L x $TMPDIR/data1.cab -d $TMPDIR || die
+cabextract -L $TMPDIR/Trmt11.exe -d $TMPDIR || diesoftly
+unshield -L x $TMPDIR/data1.cab -d $TMPDIR || diesoftly
 
-cp -R $TMPDIR/program_executable_files/* "$TARGETDIR" || die
+cp -R $TMPDIR/program_executable_files/* "$TARGETDIR" || diesoftly
 
 cleanuptmp
 setperms "$TARGETDIR"
diff --git a/pst/install-patch-tweaks.sh b/pst/install-patch-tweaks.sh
deleted file mode 100755
index a90ee40..0000000
--- a/pst/install-patch-tweaks.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# Planescape: Torment Tweak Pack
-# Note: this only installs the Banter Accelerator
-#       and Stackable Items tweaks
-
-scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/patch-includes.sh"
-
-parseargs "$@"
-
-checkforbin WeiDU unrar
-
-setuptmp
-
-if [ ! -f "$PATCHDIR/psttweak.rar" ]; then
-	echo "You need to download the fixpack from http://dl.spellholdstudios.net/pst-qtweaks" 1>&2
-	echo "and put it in $PATCHDIR to install this patch" 1>&2
-	exit
-fi
-
-unrar x -o+ -cl "$PATCHDIR/psttweak.rar" "$TARGETDIR" || die
-rm "$TARGETDIR/setup-pst-tweak.exe"
-cd "$TARGETDIR"
-
-case "$LANGUAGE" in
-	"German" ) langno=1 ;;
-	"Spanish" ) langno=2 ;;
-	"Italian" ) langno=3 ;;
-	* ) langno=0 ;;
-esac
-
-# echo to install all manually as --yes assumes English
-echo -e "${langno}\nn\n2\nn\nn\ni\nn\ni\nn\nn\nn\nn\nn\nn\nn\nn\nn\n" \
-| WeiDU --continue setup-pst-tweak.tp2 || die
-
-setperms "$TARGETDIR"
diff --git a/pst/install-patch-ub.sh b/pst/install-patch-ub.sh
deleted file mode 100755
index b26a66c..0000000
--- a/pst/install-patch-ub.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Planescape: Torment Unfinished Business
-
-scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/patch-includes.sh"
-
-parseargs "$@"
-
-checkforbin WeiDU unrar
-
-setuptmp
-
-if [ ! -f "$PATCHDIR/pstub.rar" ]; then
-	echo "You need to download the fixpack from http://dl.spellholdstudios.net/pst-ub" 1>&2
-	echo "and put it in $PATCHDIR to install this patch" 1>&2
-	exit
-fi
-
-unrar x -o+ -cl "$PATCHDIR/pstub.rar" "$TARGETDIR" || die
-rm "$TARGETDIR/setup-pst-ub.exe"
-cd "$TARGETDIR"
-
-case "$LANGUAGE" in
-	"German" ) langno=1 ;;
-	"Spanish" ) langno=2 ;;
-	"Italian" ) langno=3 ;;
-	* ) langno=0 ;;
-esac
-
-# echo to install all manually as --yes assumes English
-echo -e "${langno}\nn\ni\ni\nn\n\n" \
-| WeiDU --continue setup-pst-ub.tp2 || die
-
-setperms "$TARGETDIR"