From 1c9428ba23149f6d07556f658270db45ddcd9ff6 Mon Sep 17 00:00:00 2001 From: Nick White Date: Thu, 16 Apr 2009 11:49:13 +0100 Subject: Make patch failure non-critical --- auto-installer.sh | 2 +- includes/patch-includes.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 +} -- cgit v1.2.3