summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorNick White <git@njw.me.uk>2009-04-17 17:10:07 +0100
committerNick White <git@njw.me.uk>2009-04-17 17:10:07 +0100
commit3603dfcb5d12e19b75dccbc2a621adb83fd7adea (patch)
tree4db93b4e5fb98a380475b9edd5c0054a0d51302b /includes
parentc2c29265815ddfa73d77276bc2fd5a53be08e608 (diff)
downloadgemrb-gameinstallers-3603dfcb5d12e19b75dccbc2a621adb83fd7adea.tar.bz2
gemrb-gameinstallers-3603dfcb5d12e19b75dccbc2a621adb83fd7adea.zip
Move overridden die for patch to new general function: diesoftlyv0.1.1
Diffstat (limited to 'includes')
-rw-r--r--includes/generic-includes.sh9
-rw-r--r--includes/patch-includes.sh10
2 files changed, 9 insertions, 10 deletions
diff --git a/includes/generic-includes.sh b/includes/generic-includes.sh
index 3cc65de..d3db9bf 100644
--- a/includes/generic-includes.sh
+++ b/includes/generic-includes.sh
@@ -36,6 +36,15 @@ function die
exit 1
}
+function diesoftly
+{
+ # a non-destructive die
+
+ echo " ! The install failed; sorry." 1>&2
+
+ exit 1
+}
+
function diequietly
{
exit 1
diff --git a/includes/patch-includes.sh b/includes/patch-includes.sh
index c9bbd30..7081e9d 100644
--- a/includes/patch-includes.sh
+++ b/includes/patch-includes.sh
@@ -36,13 +36,3 @@ function getpatch
wget $url -O $TMPDIR/$filename || die
fi
}
-
-function die
-{
- # override main die for patches so they won't wipe out
- # a whole install
-
- echo " ! The patch install failed; sorry." 1>&2
-
- exit 1
-}