--- scripts/patch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/patch.sh b/scripts/patch.sh index 2b0aa29..7dfb306 100755 --- a/scripts/patch.sh +++ b/scripts/patch.sh @@ -15,14 +15,14 @@ trap 'rm -rf "$PATCHDIR"' EXIT for module in $GLUON_MODULES; do echo "--- Patching module '$module' ---"
- git clone -s -b base --single-branch "$GLUONDIR"/$module "$PATCHDIR" 2>/dev/null + git clone -s -b base --single-branch "$GLUONDIR/$module" "$PATCHDIR" 2>/dev/null
cd "$PATCHDIR" - for patch in "$GLUONDIR"/patches/$module/*.patch; do + for patch in "$GLUONDIR/patches/$module"/*.patch; do git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' -c commit.gpgsign=false am --whitespace=nowarn --committer-date-is-author-date "$patch" done
- cd "$GLUONDIR"/$module + cd "$GLUONDIR/$module" git fetch "$PATCHDIR" 2>/dev/null git checkout -B patched FETCH_HEAD git submodule update --init --recursive -- 2.10.0
On 09/24/2016 05:34 PM, Jan-Tarek Butt wrote:
scripts/patch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
I've applied your escaping patches (with a minor adjustment where I felt that the escaping was just making the script harder to read without any benefit).
Please note how I squashed some of your patches and adjusted the commit messages.
diff --git a/scripts/patch.sh b/scripts/patch.sh index 2b0aa29..7dfb306 100755 --- a/scripts/patch.sh +++ b/scripts/patch.sh @@ -15,14 +15,14 @@ trap 'rm -rf "$PATCHDIR"' EXIT for module in $GLUON_MODULES; do echo "--- Patching module '$module' ---"
- git clone -s -b base --single-branch "$GLUONDIR"/$module "$PATCHDIR" 2>/dev/null
git clone -s -b base --single-branch "$GLUONDIR/$module" "$PATCHDIR" 2>/dev/null
cd "$PATCHDIR"
- for patch in "$GLUONDIR"/patches/$module/*.patch; do
- for patch in "$GLUONDIR/patches/$module"/*.patch; do git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' -c commit.gpgsign=false am --whitespace=nowarn --committer-date-is-author-date "$patch" done
- cd "$GLUONDIR"/$module
- cd "$GLUONDIR/$module" git fetch "$PATCHDIR" 2>/dev/null git checkout -B patched FETCH_HEAD git submodule update --init --recursive
-- 2.10.0
-
Jan-Tarek Butt -
Matthias Schiffer