Rearrange to remove arbitrary bg1/totsc division

9 files changed, 5 insertions, 43 deletions

diff --git a/auto-installer.sh b/auto-installer.sh
index 32e4736..4c1fe99 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -48,17 +48,17 @@ while [ -z "$MINSCRIPT" ]; do
 		$BG1_TOTSC_3CD_US_MD5 )
 			FULLGAMENAME="Baldurs Gate & Tales of the Sword Coast: 3CD US version"
 			SHORTGAMENAME="baldursgate1totsc"
-			MINSCRIPT=totsc/install-3cd-minimal.sh
-			EXTRASCRIPT=totsc/install-3cd-extra.sh
-			PATCHES="totsc/install-patch-baldurdash-fix.sh totsc/install-patch-baldurdash-text.sh"
+			MINSCRIPT=bg1/install-3cd-minimal.sh
+			EXTRASCRIPT=bg1/install-3cd-extra.sh
+			PATCHES="bg1/install-patch-baldurdash-fix.sh bg1/install-patch-totsc-baldurdash-text.sh"
 			WINDOWSFILES="baldur.exe bgmain.exe config.exe keymap.ini luaauto.cfg update.url"
 			CDNO=3
 			;;
 		$BG1_TOTSC_1CD_UK_MD5 )
 			FULLGAMENAME="Baldurs Gate Tales of the Sword Coast: 1CD UK version"
 			SHORTGAMENAME="baldursgate1totsc"
-			MINSCRIPT=totsc/install-1cd-uk.sh
-			PATCHES="totsc/install-patch-uk.sh totsc/install-patch-baldurdash-fix.sh totsc/install-patch-baldurdash-text.sh"
+			MINSCRIPT=bg1/install-1cd-totsc-uk.sh
+			PATCHES="bg1/install-patch-totsc-uk.sh bg1/install-patch-baldurdash-fix.sh bg1/install-patch-totsc-baldurdash-text.sh"
 			WINDOWSFILES="bgmain2.exe baldur.exe config.exe mconvert.exe"
 			;;
 		$PST_2CD_MD5 )
diff --git a/totsc/install-1cd-uk.sh b/bg1/install-1cd-totsc-uk.sh
index 9f2f582..9f2f582 100755
--- a/totsc/install-1cd-uk.sh
+++ b/bg1/install-1cd-totsc-uk.sh
diff --git a/totsc/install-3cd-extra.sh b/bg1/install-3cd-extra.sh
index fe31c32..fe31c32 100755
--- a/totsc/install-3cd-extra.sh
+++ b/bg1/install-3cd-extra.sh
diff --git a/totsc/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh
index 57d9173..57d9173 100755
--- a/totsc/install-3cd-minimal.sh
+++ b/bg1/install-3cd-minimal.sh
diff --git a/totsc/install-patch-baldurdash-text.sh b/bg1/install-patch-totsc-balderdash-text.sh
index 36e4304..36e4304 100755
--- a/totsc/install-patch-baldurdash-text.sh
+++ b/bg1/install-patch-totsc-balderdash-text.sh
diff --git a/totsc/install-patch-intl.sh b/bg1/install-patch-totsc-intl.sh
index 19c2b15..19c2b15 100755
--- a/totsc/install-patch-intl.sh
+++ b/bg1/install-patch-totsc-intl.sh
diff --git a/totsc/install-patch-uk.sh b/bg1/install-patch-totsc-uk.sh
index 09ea70c..09ea70c 100755
--- a/totsc/install-patch-uk.sh
+++ b/bg1/install-patch-totsc-uk.sh
diff --git a/totsc/install-patch-us.sh b/bg1/install-patch-totsc-us.sh
index 5939ac4..5939ac4 100755
--- a/totsc/install-patch-us.sh
+++ b/bg1/install-patch-totsc-us.sh
diff --git a/totsc/install-patch-baldurdash-fix.sh b/totsc/install-patch-baldurdash-fix.sh
deleted file mode 100755
index be9b3be..0000000
--- a/totsc/install-patch-baldurdash-fix.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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.
-#
-# BG1/TOTSC Baldurdash fix pack
-
-scriptdir="$(dirname $0)"/..
-source "$scriptdir/includes/generic-includes.sh"
-source "$scriptdir/includes/patch-includes.sh"
-
-parseargs "$@"
-
-checkforbin unzip wget
-
-setuptmp
-
-getpatch http://www.baldurdash.org/LargeDownloads/BG1FixPack11.exe
-
-# unzip complains unnecessarily about skipping non-zip
-# part so don't print errors or die on failure
-unzip -L $TMPDIR/BG1FixPack11.exe -d $TMPDIR 2>/dev/null
-rm $TMPDIR/BG1FixPack11.exe $TMPDIR/bg1fixpack11readme.txt
-cp $TMPDIR/* "$TARGETDIR/override/" || diesoftly
-
-cleanuptmp
-setperms "$TARGETDIR"