From 7a0ae880e56717b833b67901d250985a92f9a3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Fri, 30 Apr 2021 11:19:31 +0200 Subject: [PATCH] Don't fail on install if the patch does not apply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 43e9319..3814b5e 100755 --- a/install.sh +++ b/install.sh @@ -8,5 +8,6 @@ set -x cp -afv ipsilon ${ROOT}${SITE_PACKAGES}/ python3 -m compileall ${ROOT}${SITE_PACKAGES}/ipsilon -cat openid-server.patch | patch -p0 --fuzz 0 -d ${ROOT}${SITE_PACKAGES}/ -N +patch_cmd="cat openid-server.patch | patch -p0 --fuzz 0 -d ${ROOT}${SITE_PACKAGES}/ -N -r -" +eval $patch_cmd || eval $patch_cmd --dry-run | grep "2 out of 2 hunks ignored" python3 -m compileall ${ROOT}${SITE_PACKAGES}/openid