diff options
| author | Nick White <git@njw.me.uk> | 2009-04-16 11:49:13 +0100 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2009-04-16 11:49:13 +0100 |
| commit | 1c9428ba23149f6d07556f658270db45ddcd9ff6 (patch) | |
| tree | 1d00bd93d18135c3df72943cf94089417915f15c | |
| parent | ae8f80f7ef3900af963ae1aa55ee066a907e7e3b (diff) | |
| download | gemrb-gameinstallers-1c9428ba23149f6d07556f658270db45ddcd9ff6.tar.bz2 gemrb-gameinstallers-1c9428ba23149f6d07556f658270db45ddcd9ff6.zip | |
Make patch failure non-critical
| -rwxr-xr-x | auto-installer.sh | 2 | ||||
| -rw-r--r-- | includes/patch-includes.sh | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/auto-installer.sh b/auto-installer.sh index 206523d..822fc61 100755 --- a/auto-installer.sh +++ b/auto-installer.sh @@ -109,7 +109,7 @@ if [ -n "$PATCHES" ]; then -p "$PATCHDIR" \ -l "$LANGUAGE" \ -c "$CDMOUNT" \ - 1>/dev/null || diequietly + 1>/dev/null fi done fi diff --git a/includes/patch-includes.sh b/includes/patch-includes.sh index 7081e9d..c9bbd30 100644 --- a/includes/patch-includes.sh +++ b/includes/patch-includes.sh @@ -36,3 +36,13 @@ 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 +} |