projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90e83a7
)
Fix incorrect git command when getting the version with an exact tag.
author
Carl Hetherington
<cth@carlh.net>
Tue, 18 Jan 2022 10:01:35 +0000
(11:01 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 18 Jan 2022 10:02:09 +0000
(11:02 +0100)
platform/osx/make_dmg.sh
patch
|
blob
|
history
diff --git
a/platform/osx/make_dmg.sh
b/platform/osx/make_dmg.sh
index 80205822a9637c44e5e76b6471e29a133439a46d..bad257d78dcbfb15c5d2e36925a9387b2fc42066 100644
(file)
--- a/
platform/osx/make_dmg.sh
+++ b/
platform/osx/make_dmg.sh
@@
-8,7
+8,7
@@
SYNTAX="make_dmg.sh <environment> <builddir> <apple-id> <apple-password> <arch1>
# were found.
# Use a tag if what we've built is exactly on one
-version=$(git describe --tags --abbrev=0 --match=v2.*.* --exact-match
$1
2> /dev/null)
+version=$(git describe --tags --abbrev=0 --match=v2.*.* --exact-match 2> /dev/null)
if [ "$?" != "0" ]; then
# Otherwise use <branch>-<commit>
version="$(basename $(git name-rev --name-only HEAD))-$(git rev-parse --short HEAD)"