diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-01-18 22:06:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-01-18 22:07:25 +0100 |
| commit | 0346fef169d2e121484fef42349f60b3b11a5401 (patch) | |
| tree | cc7be56f3bc8b7bc675e832e1d811c3a04072206 | |
| parent | dcc053a35520b01a8d9d09ac29a89906cfbb676e (diff) | |
Fix .dmg naming yet again; sed was breaking the $? check.
| -rw-r--r-- | platform/osx/make_dmg.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index faf42e635..18ca029f5 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -8,8 +8,10 @@ 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 2> /dev/null | sed -e "s/^v//") -if [ "$?" != "0" ]; then +version=$(git describe --tags --abbrev=0 --match=v2.*.* --exact-match 2> /dev/null) +if [ "$?" == "0" ]; then + version=$(echo $version | sed -e "s/^v//") +else # Otherwise use <branch>-<commit> version="$(basename $(git name-rev --name-only HEAD))-$(git rev-parse --short HEAD)" fi |