Skip to content

Commit 7aecad9

Browse files
author
Patricia Aas
committed
Fix the final shellcheck warnings
1 parent 21cdd55 commit 7aecad9

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

update.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -504,19 +504,21 @@ create_script() {
504504
cd "$CHROMIUM_DIR"
505505
info "[Chromium] Create patch script"
506506
# Get the tags
507-
OLD_TAG_SHA=`git log -1 --format=format:"%H" ${OLD_TAG}`
508-
HEAD_SHA=`git log -1 --format=format:"%H" HEAD`
507+
OLD_TAG_SHA=$(git log -1 --format=format:"%H" ${OLD_TAG})
508+
HEAD_SHA=$(git log -1 --format=format:"%H" HEAD)
509509

510510
# Get all the commits
511-
git log --ancestry-path ${OLD_TAG_SHA}..${HEAD_SHA} --pretty=format:"git cherry-pick --strategy=recursive -X patience %h%x09 # %ae%x09%ad%x09%s" > commit_log.txt
511+
git log --ancestry-path "${OLD_TAG_SHA}".."${HEAD_SHA}" --pretty=format:"git cherry-pick --strategy=recursive -X patience %h%x09 # %ae%x09%ad%x09%s" > commit_log.txt
512512
echo -e '\n' >> commit_log.txt
513513
tac commit_log.txt > cherry_pick_log.txt
514514

515515
# Create the readme script
516-
echo -e '#!/bin/bash' > $README_FILENAME
517-
echo -e 'set -e\n' >> $README_FILENAME
518-
echo -e "# Based on branch: ${OLD_BRANCH}" >> $README_FILENAME
519-
cat cherry_pick_log.txt >> $README_FILENAME
516+
{
517+
echo -e '#!/bin/bash'
518+
echo -e 'set -e\n'
519+
echo -e "# Based on branch: ${OLD_BRANCH}"
520+
cat cherry_pick_log.txt
521+
} > $README_FILENAME
520522

521523
rm commit_log.txt cherry_pick_log.txt
522524
mv $README_FILENAME "${CHROMIUM_UPDATE_DIR}"/updates/${README_FILENAME}

0 commit comments

Comments
 (0)