Noticed a similar version extraction glitch.
Cristian Ionescu-Idbohrn
cristian.ionescu-idbohrn at axis.com
Sat Feb 16 09:18:28 PST 2013
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn at axis.com>
---
packaging/macosx/make-package.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index c8d21b2..e822359 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -24,7 +24,8 @@ PREFIX="/Applications/Subsurface.app/Contents/Resources"
INFOPLIST=./packaging/macosx/Info.plist
# same git version magic as in the Makefile
-VERSION=`git describe --tags --abbrev=12 | sed 's/v\([0-9]*\)\.\([0-9]*\)-\([0-9]*\)-.*/\1.\2.\3/ ; s/v\([0-9]\)\.\([0-9]*\)/\1.\2.0/' || echo "git.missing.please.hardcode.version"`
+VERSION=`git describe --tags --abbrev=12 | sed -e 's/^v\([^-]\+\)-.*/\1.0/' || \
+ echo "git.missing.please.hardcode.version"`
# gtk-mac-bundler allegedly supports signing by setting this environment
# variable, but this fails as we change the shared objects below and all
@@ -67,4 +68,3 @@ ${DMGCREATE} --background ./packaging/macosx/DMG-Background.png \
--app-drop-link 380 205 \
--volicon ~/subsurface/packaging/macosx/Subsurface.icns \
--icon "Subsurface" 110 205 ./Subsurface-${VERSION}.dmg ./staging
-
--
1.7.10.4
More information about the subsurface
mailing list