Teach OS X package builder script to look up the version dynamically

1 files changed, 16 insertions, 3 deletions

diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh
index 1c4f70ee..2fb452ea 100755
--- a/build_tools/make_pkg.sh
+++ b/build_tools/make_pkg.sh
@@ -1,10 +1,23 @@
-#!/bin/sh -x
+#!/bin/sh
+
+VERSION=`sed -E -n 's/^.*PACKAGE_VERSION "([0-9.]+)"/\1/p' osx/config.h`
+if test -z "$VERSION" ; then
+  echo "Could not get version from osx/config.h"
+  exit 1
+fi
+
+echo "Version is $VERSION"
+
+set -x
 
 make distclean
 rm -Rf /tmp/fish_pkg
-mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst
 
+#Exit on error
+set -e
+
+mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst
 xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/
-pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' /tmp/fish_pkg/intermediates/fish.pkg
+pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION"  /tmp/fish_pkg/intermediates/fish.pkg
 
 productbuild  --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg