From eee10a3f9c390cec2f93f091196473386193430f Mon Sep 17 00:00:00 2001 From: thejch <66577496+thejch@users.noreply.github.com> Date: Sat, 20 Apr 2024 16:04:47 -0700 Subject: [PATCH] meson: fix patch script compatibility (#8) --- patches/apply.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/patches/apply.sh b/patches/apply.sh index 280f72d6..d5492b1b 100755 --- a/patches/apply.sh +++ b/patches/apply.sh @@ -1,31 +1,27 @@ -#!/bin/bash +#!/bin/sh -eu # find all patches in patches/ PATCHES=$(find patches/ -type f -name '*.patch') -check () { - git apply --check -q -p1 $PATCH -} - apply () { - git apply -p1 $PATCH + git apply $PATCH } check_applied () { - git apply --check --reverse -q -p1 $PATCH + git apply --check --reverse -q $PATCH } fail () { echo =======\> \'$PATCH\' was not applied && exit 1 } -if [[ -n "$PATCHES" ]]; +if [ -n "$PATCHES" ]; then # check patch validity and apply, else check if already applied and report and exit on failure echo 'Patches found. Applying...'; for PATCH in $PATCHES; do - check && apply || check_applied || fail; + apply || check_applied || fail; done else echo 'No patches found.'