Skip to content

Commit dc1fba9

Browse files
committed
scripted-diff: Rename share/genbuild.sh macros to more meaningful ones
-BEGIN VERIFY SCRIPT- sed -i 's/\bDESC\b/GIT_TAG/' share/genbuild.sh sed -i 's/\bSUFFIX\b/GIT_COMMIT/g' share/genbuild.sh -END VERIFY SCRIPT-
1 parent 1e06bb6 commit dc1fba9

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

share/genbuild.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ else
1818
exit 1
1919
fi
2020

21-
DESC=""
22-
SUFFIX=""
21+
GIT_TAG=""
22+
GIT_COMMIT=""
2323
if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
2424
# clean 'dirty' status of touched files that haven't been modified
2525
git diff >/dev/null 2>/dev/null
2626

2727
# if latest commit is tagged and not dirty, then override using the tag name
2828
RAWDESC=$(git describe --abbrev=0 2>/dev/null)
2929
if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then
30-
git diff-index --quiet HEAD -- && DESC=$RAWDESC
30+
git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC
3131
fi
3232

3333
# otherwise generate suffix from git, i.e. string like "59887e8-dirty"
34-
SUFFIX=$(git rev-parse --short HEAD)
35-
git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
34+
GIT_COMMIT=$(git rev-parse --short HEAD)
35+
git diff-index --quiet HEAD -- || GIT_COMMIT="$GIT_COMMIT-dirty"
3636
fi
3737

38-
if [ -n "$DESC" ]; then
39-
NEWINFO="#define BUILD_DESC \"$DESC\""
40-
elif [ -n "$SUFFIX" ]; then
41-
NEWINFO="#define BUILD_SUFFIX $SUFFIX"
38+
if [ -n "$GIT_TAG" ]; then
39+
NEWINFO="#define BUILD_DESC \"$GIT_TAG\""
40+
elif [ -n "$GIT_COMMIT" ]; then
41+
NEWINFO="#define BUILD_SUFFIX $GIT_COMMIT"
4242
else
4343
NEWINFO="// No build information available"
4444
fi

0 commit comments

Comments
 (0)