--- scripts/update-patches.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/update-patches.sh b/scripts/update-patches.sh index f8b9202..62d5bf7 100755 --- a/scripts/update-patches.sh +++ b/scripts/update-patches.sh @@ -8,14 +8,14 @@ shopt -s nullglob for module in $GLUON_MODULES; do echo "--- Updating patches for module '$module' ---"
- rm -f "$GLUONDIR"/patches/$module/*.patch - mkdir -p "$GLUONDIR"/patches/$module + rm -f "$GLUONDIR"/patches/"$module"/*.patch + mkdir -p "$GLUONDIR"/patches/"$module"
- cd "$GLUONDIR"/$module + cd "$GLUONDIR"/"$module"
n=0 for commit in $(git rev-list --reverse --no-merges base..patched); do let n=n+1 - git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' --no-renames $commit > "$GLUONDIR"/patches/$module/"$(printf '%04u' $n)-$(git show -s --pretty=format:%f $commit).patch" + git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' --no-renames "$commit" > "$GLUONDIR/patches/$module/$(printf '%04u' $n)-$(git show -s --pretty=format:%f "$commit").patch" done done -- 2.10.0
Sag mal man muss das sein, dass hier jeder commit über die ML gejagt wird?!
Am 24. September 2016 17:37:32 MESZ, schrieb Jan-Tarek Butt tarek@ring0.de:
scripts/update-patches.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/update-patches.sh b/scripts/update-patches.sh index f8b9202..62d5bf7 100755 --- a/scripts/update-patches.sh +++ b/scripts/update-patches.sh @@ -8,14 +8,14 @@ shopt -s nullglob for module in $GLUON_MODULES; do echo "--- Updating patches for module '$module' ---"
- rm -f "$GLUONDIR"/patches/$module/*.patch
- mkdir -p "$GLUONDIR"/patches/$module
- rm -f "$GLUONDIR"/patches/"$module"/*.patch
- mkdir -p "$GLUONDIR"/patches/"$module"
- cd "$GLUONDIR"/$module
cd "$GLUONDIR"/"$module"
n=0 for commit in $(git rev-list --reverse --no-merges base..patched); do let n=n+1
git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B'
--no-renames $commit > "$GLUONDIR"/patches/$module/"$(printf '%04u' $n)-$(git show -s --pretty=format:%f $commit).patch"
git show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B'
--no-renames "$commit" > "$GLUONDIR/patches/$module/$(printf '%04u' $n)-$(git show -s --pretty=format:%f "$commit").patch" done done -- 2.10.0
--- scripts/update.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/update.sh b/scripts/update.sh index 1c750f6..d034c8f 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -6,17 +6,17 @@ set -e
for module in $GLUON_MODULES; do echo "--- Updating module '$module' ---" - var=$(echo $module | tr '[:lower:]/' '[:upper:]_') - eval repo=${${var}_REPO} - eval branch=${${var}_BRANCH} - eval commit=${${var}_COMMIT} + var=$(echo "$module" | tr '[:lower:]/' '[:upper:]_') + eval repo=$'{'"${var}"_REPO'}' + eval branch=$'{'"${var}"_BRANCH'}' + eval commit=$'{'"${var}"_COMMIT'}'
- mkdir -p "$GLUONDIR"/$module - cd "$GLUONDIR"/$module + mkdir -p "$GLUONDIR/$module" + cd "$GLUONDIR/$module" git init
- if ! git branch -f base $commit 2>/dev/null; then - git fetch $repo $branch - git branch -f base $commit 2>/dev/null + if ! git branch -f base "$commit" 2>/dev/null; then + git fetch "$repo" "$branch" + git branch -f base "$commit" 2>/dev/null fi done -- 2.10.0