1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00

Use rev-parse instead of show-ref (#1958)

* Use `rev-parse` instead of `show-ref`

* Dev builds currently use masters commit ref and makes it difficult to determine which version is really installed with About → Help. Use the current HEAD when generating the `Makefile`s for `DGIT_REVISION`

**NOTES**
* The bash scripts are somewhat duplicated with the unused `--short` parameter but omitted at this time in case a long hash is wanted.
* `make distclean` is still needed since those defines are hard-coded into those affected `Makefile`s

* Keep current abstract as per @nowrep

* Remove some known unneeded bash pipes
This commit is contained in:
Marti Martz 2016-04-25 04:53:03 -06:00 committed by David Rosca
parent 8332705fc9
commit c0026af63e
4 changed files with 4 additions and 4 deletions

View File

@ -2,4 +2,4 @@
# #
# Writes git revision into git_revision file # Writes git revision into git_revision file
# #
git show-ref refs/heads/master | cut -d " " -f 1 > git_revision git rev-parse HEAD > git_revision

View File

@ -2,4 +2,4 @@
# #
# Writes git revision into git_revision file # Writes git revision into git_revision file
# #
git show-ref refs/heads/master | cut -d " " -f 1 > git_revision git rev-parse HEAD > git_revision

View File

@ -2,4 +2,4 @@
# #
# Writes git revision into git_revision file # Writes git revision into git_revision file
# #
git show-ref refs/heads/master | cut -d " " -f 1 > git_revision git rev-parse HEAD > git_revision

View File

@ -3,7 +3,7 @@
REV="" REV=""
if [ -e "/usr/bin/git" ] && ([ -e ".git" ] || [ -e "../.git" ]); then if [ -e "/usr/bin/git" ] && ([ -e ".git" ] || [ -e "../.git" ]); then
REV=`git show-ref refs/heads/master | cut -d " " -f 1` REV=`git rev-parse HEAD`
elif [ -e "git_revision" ]; then elif [ -e "git_revision" ]; then
REV=`cat git_revision` REV=`cat git_revision`
fi fi