diff options
| author | Nick White <git@njw.me.uk> | 2009-04-17 17:10:07 +0100 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2009-04-17 17:10:07 +0100 |
| commit | 3603dfcb5d12e19b75dccbc2a621adb83fd7adea (patch) | |
| tree | 4db93b4e5fb98a380475b9edd5c0054a0d51302b /bg1 | |
| parent | c2c29265815ddfa73d77276bc2fd5a53be08e608 (diff) | |
| download | gemrb-gameinstallers-3603dfcb5d12e19b75dccbc2a621adb83fd7adea.tar.bz2 gemrb-gameinstallers-3603dfcb5d12e19b75dccbc2a621adb83fd7adea.zip | |
Move overridden die for patch to new general function: diesoftlyv0.1.1
Diffstat (limited to 'bg1')
| -rwxr-xr-x | bg1/install-patch-baldurdash-fix.sh | 2 | ||||
| -rwxr-xr-x | bg1/install-patch-baldurdash-text.sh | 4 | ||||
| -rwxr-xr-x | bg1/install-patch-intl.sh | 6 | ||||
| -rwxr-xr-x | bg1/install-patch-us.sh | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bg1/install-patch-baldurdash-fix.sh b/bg1/install-patch-baldurdash-fix.sh index ef00260..be9b3be 100755 --- a/bg1/install-patch-baldurdash-fix.sh +++ b/bg1/install-patch-baldurdash-fix.sh @@ -32,7 +32,7 @@ getpatch http://www.baldurdash.org/LargeDownloads/BG1FixPack11.exe # 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/" || die +cp $TMPDIR/* "$TARGETDIR/override/" || diesoftly cleanuptmp setperms "$TARGETDIR" diff --git a/bg1/install-patch-baldurdash-text.sh b/bg1/install-patch-baldurdash-text.sh index bab642d..9dbf9a9 100755 --- a/bg1/install-patch-baldurdash-text.sh +++ b/bg1/install-patch-baldurdash-text.sh @@ -24,7 +24,7 @@ parseargs "$@" if [ "$LANGUAGE" != "English" ]; then echo "The Baldurdash text pack is only available in English" - die + diesoftly fi checkforbin unzip wget @@ -36,7 +36,7 @@ getpatch http://www.baldurdash.org/LargeDownloads/BG1NoTOSCGameTextUpdate10.exe # unzip complains unnecessarily about skipping non-zip # part so don't print errors or die on failure unzip -L $TMPDIR/BG1NoTOSCGameTextUpdate10.exe -d $TMPDIR 2>/dev/null -cp $TMPDIR/dialog.tlk "$TARGETDIR/" || die +cp $TMPDIR/dialog.tlk "$TARGETDIR/" || diesoftly cleanuptmp setperms "$TARGETDIR" diff --git a/bg1/install-patch-intl.sh b/bg1/install-patch-intl.sh index 2c0aceb..2acb59e 100755 --- a/bg1/install-patch-intl.sh +++ b/bg1/install-patch-intl.sh @@ -28,11 +28,11 @@ setuptmp getpatch http://downloads.bioware.com/baldursgate1/bgintl114315.exe -unzip $TMPDIR/bgintl114315.exe -d $TMPDIR || die -unshield -g "$LANGUAGE" -L x $TMPDIR/data1.cab -d $TMPDIR || die +unzip $TMPDIR/bgintl114315.exe -d $TMPDIR || diesoftly +unshield -g "$LANGUAGE" -L x $TMPDIR/data1.cab -d $TMPDIR || diesoftly LANGUAGE="$(echo $LANGUAGE|tr A-Z a-z|tr ' ' _)" # alter formatting -cp -R $TMPDIR/"$LANGUAGE"/* "$TARGETDIR" || die +cp -R $TMPDIR/"$LANGUAGE"/* "$TARGETDIR" || diesoftly cleanuptmp setperms "$TARGETDIR" diff --git a/bg1/install-patch-us.sh b/bg1/install-patch-us.sh index 41a5e71..c3fe4b0 100755 --- a/bg1/install-patch-us.sh +++ b/bg1/install-patch-us.sh @@ -28,10 +28,10 @@ setuptmp getpatch http://downloads.bioware.com/baldursgate1/bg114315.exe -cabextract -L $TMPDIR/bg114315.exe -d $TMPDIR || die -unshield -L x $TMPDIR/data1.cab -d $TMPDIR || die +cabextract -L $TMPDIR/bg114315.exe -d $TMPDIR || diesoftly +unshield -L x $TMPDIR/data1.cab -d $TMPDIR || diesoftly -cp -R $TMPDIR/english/* "$TARGETDIR" || die +cp -R $TMPDIR/english/* "$TARGETDIR" || diesoftly cleanuptmp setperms "$TARGETDIR" |